[SOLVED] Persistent Cherry Picking Problem... - Omni Q&A

...that I cannot explain and have no idea how to fix.
A while ago I've been getting pretty inexplicable build errors mentioned here and here. It took me a couple of days to realize that these issues were happening because of the multi-window cherry pick.
1. I would do a fresh sync, compare several of my local files in frameworks/base/core/java to those at Omni github repo, and everything would match,
2. then cherry pick multi-windows, and
3. revisit the same files in f/b/c/java, and they would be different from the Omni repo.
It felt as if the HEAD rolled back a couple of steps after the cherry pick.
Things are even worse today; this is a screenshot of my frameworks/base/packages after a fresh sync and before the cherry pick:
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
This is the cherry pick a moment later:
And this is another screenshot of frameworks/base/packages immediately after the cherry pick, with several folders missing (DocumentsUI, Keyguard, services etc):
Let me add that the small cherry picks, let's say in a device tree, are perfectly OK.
Would someone be kind enough to shed some light on this and offer a way to rectify the situation, please?

I have managed to persuade it to work with a little bit of git branching.
What I did was
1. rm -rf frameworks and resync
2. go to frameworks/base and cherry pick
3. git checkout -b widow™
4. repeat step #1
5. again drop into frameworks/base
6. git checkout -b main
7. git merge widow
And it worked.
I still don't know why it happens, though.

That's because:
1) You're using checkout instead of cherry-pick
2) You're not using "repo start"
Mostly 1)

Entropy512 said:
That's because:
1) You're using checkout instead of cherry-pick
2) You're not using "repo start"
Mostly 1)
Click to expand...
Click to collapse
Let me repost image #2 from the first post:
I started using branches as a workaround because simple cherry pick didn't work.

chasmodo said:
Let me repost image #2 from the first post:
I started using branches as a workaround because simple cherry pick didn't work.
Click to expand...
Click to collapse
Why are you reposting an image that confirms that you are using checkout instead of cherry pick?
?
It appears that you've clicked on "checkout" instead of "cherry-pick" in the gerrit patch summary.

Related

New ROM Directory

If some developers could try and add their ROM's to test this out that would be a big help.
http://roms.scottymeuk.co.uk
Features
Add Device
Add ROM to Device
Add Version (Release) to ROM
Changelog
Comment System
Like/Dislikes
http://roms.scottymeuk.co.uk
This is probably been attempted before but I got bored and decided to make a ROM Directory type thing. It took me a day to develop and is written in PHP using the CakePHP framework for anyone that is interested.
If anyone has any feedback or anything please let me know.
The reason there is only 1 ROM added is because they are the files i have on my PC as i use that ROM.
Below are some pictures of it:
http://roms.scottymeuk.co.uk
Add Device
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
Add ROM Version
Device Home
Device Page
Login
ROM Page
Submit ROM
Change Log (Per Version)
http://roms.scottymeuk.co.uk
Very nice set up I would definitely use it. Ive been doing alot of work lately on my friends and family's android phones and if you can get this up it wont take forever to find a rom that they like and i can set it up for them
http://roms.scottymeuk.co.uk
It would definitely be nice to have one stop place for all the latest ROMs. But, in my opinion creating the website isn't the hard part, the hard part is to keep your directory updated with the latest ROMs.
Because there are lots of ROMs available (different phones, different versions etc) and many people use nightly builds too like in case of Cyanogen. So, that would mean you will have to update the data/urls/change logs etc regularly.
How do you plan to aggregate and update all this data? Manually? Or fetch data as a feed from their respective website? Or hoping for the web 2.0 way?
But, if you manage to do that then it would be really great.
People who create the ROM's will be able to do all of that them self. The way it works is that the ROM is submitted by someone (doesn't have to be the developer) and then that ROM is locked to their account, it is then approved by an admin and then they are then free to add as many versions as they want, where they can upload a zip file, and add change log for THAT version.
The change log is not one big database entry, it is the "versions" of the roms. For each version you submit there is a change log.

CM7 for Samsung Admire (also known as Vitality or SCH-R720)

What the is this?
It's requisite0's build(s) of Cyanogenmod 7.2 Release Candidate 1, ClockWorkMod Recovery 5.0.2.8, and custom Kernel.
How do I use it?
1. First make sure you do a nandroid backup.
2. Flash the CWM Recovery and Kernel package, then go to Advanced->Reboot recovery. Here: http://d-h.st/tU6
3. Install the latest version of Cyanogenmod 7.2 ROM. Here: http://d-h.st/PmW
4. [The files were deleted for the step about the configuration for Cricket Wireless and nTelos]
5. Install the latest gapps (no longer necessary to mount system beforehand) zip. Here: http://d-h.st/pT4
6. (OPTIONAL) Install the overclocked kernel. Here: https://www.dropbox.com/s/2765gmtxnotqp0k/CM72RC1-OCKernel900MHz-requisite0.zip
7. Select Reboot system now and wait at least 10 minutes for the market updates to take effect (connect to wifi first if data connection isn't working)(first boot might take a minute).
What works?
Wifi
Bluetooth
Data
Texting
Cell Service
USB
Camera (video)
Data/MMS (in 90% of cases)
What doesn't work?
Camera (still pictures)
Data/MMS (in 10% of cases)
Do you provide source code?
Yes. You can check requisite0's GitHub here: https://github.com/requisite0
This is not my work, this was done by requisite0 at androidforums. I am just informing those with the Samsung Admire. Here is the original thread: http://androidforums.com/admire-all-things-root/587358-rom-cwm-kernel-cm7-2-rc1-requisite0-beta2.html
Now we just need someone to pick this rom up and complete it.For Cm7 beta2 it works well.Just a few bugs to work out.
Req did a great job with it so far.Anyone up for finishing it?
Check this forum: http://androidforums.com/admire-all-things-root/
Over at Android Forums there is support for our phone, we have devs like Boraichee, RetroDelete working on getting bugs fixed in CM7. requisite0 is banned which means if there is an update to his CM7.2 ROM/Kernel he won't be able to post it. But I noticed that your probably already know that since you are also at Android Forums.
how the hell do we do any thing if people keep uploading to mediafire!? that website is dead, its not a good website anymore.
Still waiting for the release version of cm7 Hope Req0 gets it done soon.
And thanks to Pg and others for all their work in this project.
Doug
Hi, how to fix roaming icon?
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
I fixed mine by deleting efi_0 from EFS using QPST
undeground88 said:
Hi, how to fix roaming icon?
Click to expand...
Click to collapse
What rom version was that? Looked newer than cm7.2
does anyone have a link to the kernel?

Want to try Ubuntu Touch on your phone? We're almost there!

In the last weeks I blogged a couple of times about how we want to get Ubuntu out to more and more users in a much much easier way. It would be great if we could have gotten all images built in the data centre, but unfortunately do redistributability issues (some firmwares, blobs and proprietary kernel modules) not allow us to redistribute them easily. Another issue were some short-comings in our infrastructure, which have to some degree been fixed already.
Anyway... we wanted to make it easier and take sort of a short-cut, so the unstoppable Sergio Schvezov sat down and restructured phablet-tools to let us much more easily support community ports of Ubuntu Touch.
What does this mean?
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
Up until now, phablet-flash just supported these four devices: Galaxy Nexus, Nexus 4, Nexus 7 and Nexus 10. That was it.
After some discussions with port maintainers around the globe, we are quite happy to announce that we are now adding the following community ports to the mix: HTC Desire Z, Samsung Galaxy S2, Huawei Ascend P1. Now the family of phablet-flash‘able devices would look like this:
Once Sergio’s branch has landed, you will be able to just run
Code:
phablet-flash community --device u9200
to flash your device. (The above would be what you’d need to type in for a Huawei Ascend P1.) Until then you can just
Code:
bzr branch lp:~sergiusens/phablet-tools/flash_change
and run it from there.
More and more devices are on the way, and the process for telling phablet-flash about your port is actually quite easy.
You can help!
If you have any of the devices lists on our Touch Devices list, and you made a backup of things and you generally know your way around in terms of flashing, etc. Do the following:
Check if your port is registered already. If yes, great. If not, please talk to the port maintainers listed on the page linked from our devices list and follow the instructions for registering the port.
Code:
bzr branch lp:~sergiusens/phablet-tools/flash_change; cd flash_change; ./phablet-flash community --device <vendor>
(ie, i9100)
Give feedback on the ubuntu-phone mailing list.
Thanks a bunch in advance!
Quick update: now it's just
bzr branch lp: phablet-tools; cd phablet-tools
./phablet-flash community --device <vendor>
Click to expand...
Click to collapse
(Remove the space between "lp:" and "phablet-tools" - auto-smiley got me here.
If you run saucy and have phablet-tools installed, you can now just run:
Code:
phablet-flash community --device <vendor>
Great work, everyone.
Any word on when/how we'll be able to use CM10.2 to build the Android parts? I don't have much of an option for the new N7.
Sent from my Nexus 4 using Tapatalk 2

Conpiling error

Hi i cant conpile the paranoid android rom to mi2 because this error is showing up. Help me.
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
Sent from my ME301T using Tapatalk
you have to adapt the device tree for PA. take a look at the nexus4 repo for PA.
How to do that
Sent from my MI 2S using Tapatalk
well, just take a look the mako repos:
https://github.com/AOSPA/android_device_lge_mako
Also I can't see any CAF repos on their github so you probably will have a hard time getting audio, camera, etc working.
EDIT: if you use AOSPA-legacy you won't have the hardware problems but u still need to adapt the code.
I ported it for you: https://github.com/M1cha/android_device_xiaomi_aries/tree/pa-4.4
Is PA closed source or sth.? because this ROM looks like AOSP except for a few features.
Thx
Sent from my MI 2S using Tapatalk
thx very much i started the compiling and the error did not appear thx for your help, and for your patience
I try to make it official: https://github.com/AOSPA-legacy/android_vendor_pa/pull/66
new error
now this error appeared
don't worry. sometimes PA isn't compilable(they don't have nightlies)
pick this: https://github.com/PAC-man/android_frameworks_base/commit/136af47161127f8e7260d109f11887b6a4d45804
and revert this: https://github.com/AOSPA-legacy/and...mmit/f465011409467773ed7c008aed83e9ddf8ca9445
This is the best news for Mi2s, sadly I don't have my Mi2s anymore.
m11kkaa said:
don't worry. sometimes PA isn't compilable(they don't have nightlies)
pick this: https://github.com/PAC-man/android_frameworks_base/commit/136af47161127f8e7260d109f11887b6a4d45804
and revert this: https://github.com/AOSPA-legacy/and...mmit/f465011409467773ed7c008aed83e9ddf8ca9445
Click to expand...
Click to collapse
how to download and insert this to the rom ??
anonim14 said:
how to download and insert this to the rom ??
Click to expand...
Click to collapse
just resync and try again. it should work now.
Also mi2 got merged into official PA repos and we'll receive nightlies soon.
thx for your help your the best i put that two you gave me in my roomservice is that ok ??? and now this error accurse
anonim14 said:
thx for your help your the best i put that two you gave me in my roomservice is that ok ??? and now this error accurse
Click to expand...
Click to collapse
you should never ever edit roomservice because this file is autogenerated.
Just follow the general build instructions.
But the roomservice i wrote myself
Sent from my MI 2S using Tapatalk
you should use local_manifest for that
btw you have to use official PA repos: https://github.com/AOSPA-legacy/android_device_xiaomi_aries
and check the dependencies: https://github.com/AOSPA-legacy/android_device_xiaomi_aries/blob/kitkat/pa.dependencies
this is senseless work though because u can use roomservice.
Yeah i maked a local_manifest folder and in that folder a roomserice.xml and there i wrote the device tree
Sent from my ME301T using Tapatalk

[DEVELOPMENT] Android 5.1 discussion

Hey guys,
we all use and work on different ROMs, be it OmniROM, CyanogenMod or AOSPA. However we all use very similar (if not the same) device trees and for that reason, I have decided to create this thread. Anyone can post test builds, logs, experiences, commits or whatever here without having to clutter other threads or open new ones.
My kernel should be good to go (it is pretty much up to date with the latest CAF upstream of the A-family, which means none of the kernel commits on cm gerrit (android_kernel_sony_apq8064) are required.) I'll be pushing everything I commit here: android_kernel_sony_apq8064.
Looking forward to a successful/effective collaboration guys.
Sounds good to me
Gave SlimLP a go - it boots. Although I didn't test it for long, I did notice that RIL is broken. Everything else should be working. I've used the kernel mentioned in the OP to get it compiled. I'll probably continue working on this on the next weekend.
{
"lightbox_close": "Close",
"lightbox_next": "Next",
"lightbox_previous": "Previous",
"lightbox_error": "The requested content cannot be loaded. Please try again later.",
"lightbox_start_slideshow": "Start slideshow",
"lightbox_stop_slideshow": "Stop slideshow",
"lightbox_full_screen": "Full screen",
"lightbox_thumbnails": "Thumbnails",
"lightbox_download": "Download",
"lightbox_share": "Share",
"lightbox_zoom": "Zoom",
"lightbox_new_window": "New window",
"lightbox_toggle_sidebar": "Toggle sidebar"
}
Olivier said:
Gave SlimLP a go - it boots. Although I didn't test it for long, I did notice that RIL is broken. Everything else should be working. I've used the kernel mentioned in the OP to get it compiled. I'll probably continue working on this on the next weekend.
Click to expand...
Click to collapse
Yeah RIL is broken due to old sepolicies, I haven't had a chance to update them for Lollipop yet. Should be pretty easy though, using either pabx's policies or mako's for reference.
SuperHanss said:
I haven't had a chance to update them for Lollipop yet.
Click to expand...
Click to collapse
Yea me neither, I just went for permissive SELinux and disabled our policies (in fusion3-common) as they were breaking the build. We'll see...
I have updated the kernel to LA.AF.1.1-01310-8064.0. More CAF upstream coming soon...
Bump (and this goes to everyone using any 5.1 ROM) - just out of curiosity; what kind of random reboots do you guys experience? Hard reboots? Soft reboots? Or something else?
Describe the issues as precise as possible and upload logcat, dmesg and last_kmsg (and mention what ROM build you use)
I use pabx lollipop 5.1 aosp as daily driver.
Absolutely great working rom, no issues, no reboots no freezes. I feel like i have a nexus
Guys the reboot issue has been solved for me after update and it only happened when phone was in charge any idea why I have a lot apps crashing specially on Google chrome

Categories

Resources