[Nexus 6P Android Development] kicker22004:
Ok i've fetched the needed 3 git's.. and cherry picked these.....From framework/base

git cherry-pick 2797fee2b1557eaa860299bcc284c4b62d847669 a86759a6591e37aab336e2996953c3baf96d548b 7ad942e97f63b09c3969102c2091732fabaa5cd0 0b87997f9f69f164161c6a84cfe530b199b44399 19df4b30ef07eeea063c1afe8a2204d75b0be696 ab4fcdd4da01365514053aa7e2c358189f62575f 59cfc8bc4ff7c8cc3aae7f14370e0fd2f5abb39d 0ab20db562cb1cf8f0ef590a571958b2bd1ac391 d2ab084ef64acf02cf0816a2b75ea86a7840a099 138282a26c0eee009ceb7d62533656eab2d77cc4 f87677c95eb5289ed3b8f8f4d21dfb4b3daed60b d693e66eb73f961608af8b749a28cb8d4bc1b2b6 2bbaccf1c077ba3b6b399e82ad13a84e81de52a6

git status gives me this again.

HEAD detached from 1e7974b

You are currently cherry-picking commit 19df4b3.

(fix conflicts and run "git cherry-pick --continue")

(use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

modified: cmds/idmap/Android.mk

modified: cmds/idmap/idmap.cpp

modified: cmds/idmap/idmap.h

deleted: cmds/idmap/scan.cpp

modified: core/java/android/app/ActivityManagerNative.java

modified: core/java/android/app/ActivityThread.java

modified: core/java/android/app/ApplicationPackageManager.java

modified: core/java/android/app/ApplicationThreadNative.java

modified: core/java/android/app/ContextImpl.java

modified: core/java/android/app/IActivityManager.java

modified: core/java/android/app/IApplicationThread.java

modified: core/java/android/app/LoadedApk.java

modified: core/java/android/app/ResourcesManager.java

modified: core/java/android/content/pm/ApplicationInfo.java

modified: core/java/android/content/res/AssetManager.java

modified: core/java/android/content/res/Resources.java

modified: core/java/android/content/res/ResourcesImpl.java

modified: core/java/android/content/res/ResourcesKey.java

modified: core/jni/android_util_AssetManager.cpp

modified: core/tests/coretests/src/android/content/res/ResourcesManagerTest.java

modified: include/androidfw/AssetManager.h

modified: libs/androidfw/AssetManager.cpp

modified: services/core/java/com/android/server/SystemServiceManager.java

modified: services/core/java/com/android/server/am/ActivityManagerService.java

modified: services/core/java/com/android/server/om/OverlayManagerService.java

modified: services/java/com/android/server/SystemServer.java

Unmerged paths:

(use "git add <file>..." to mark resolution)

both modified: core/java/android/content/pm/PackageParser.java

both modified: services/core/java/com/android/server/pm/PackageManagerService.java

Inside the PackageParser.java is a small section that isn't on the git so I removed it, the first time but failed so left it and failed...

Inside the PackageManagerService.java is a long list of code that was removed on the Github so I did the same, but failed. Lets hope it's because of the other 2 parts.. Tho i'm not sure what to cherry pick from those sections. Going to run this again for now I guess.

PackageParser.java HEAD:

<<<<<<< HEAD
if (pkg.mOverlayPriority < 0 || pkg.mOverlayPriority > 9999) {
outError[0] = "<overlay> priority must be between 0 and 9999";
mParseError =
PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;
return null;
}
=======
>>>>>>> 19df4b3... OMS-N: integrate OverlayManagerService into framework [6/14]

PackageManagerService.java HEAD:

<<<<<<< HEAD

private void createIdmapsForPackageLI(PackageParser.Package pkg) {

ArrayMap<String, PackageParser.Package> overlays = mOverlays.get(pkg.packageName);

if (overlays == null) {

Slog.w(TAG, "Unable to create idmap for " + pkg.packageName + ": no overlay packages");

return;

}

for (PackageParser.Package opkg : overlays.values()) {

// Not much to do if idmap fails: we already logged the error

// and we certainly don't want to abort installation of pkg simply

// because an overlay didn't fit properly. For these reasons,

// ignore the return value of createIdmapForPackagePairLI.

createIdmapForPackagePairLI(pkg, opkg);

}

}

private boolean createIdmapForPackagePairLI(PackageParser.Package pkg,

PackageParser.Package opkg) {

if (!opkg.mTrustedOverlay) {

Slog.w(TAG, "Skipping target and overlay pair " + pkg.baseCodePath + " and " +

opkg.baseCodePath + ": overlay not trusted");

return false;

}

ArrayMap<String, PackageParser.Package> overlaySet = mOverlays.get(pkg.packageName);

if (overlaySet == null) {

Slog.e(TAG, "was about to create idmap for " + pkg.baseCodePath + " and " +

opkg.baseCodePath + " but target package has no known overlays");

return false;

}

final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);

// TODO: generate idmap for split APKs

try {

mInstaller.idmap(pkg.baseCodePath, opkg.baseCodePath, sharedGid);

} catch (InstallerException e) {

Slog.e(TAG, "Failed to generate idmap for " + pkg.baseCodePath + " and "

+ opkg.baseCodePath);

return false;

}

PackageParser.Package[] overlayArray =

overlaySet.values().toArray(new PackageParser.Package[0]);

Comparator<PackageParser.Package> cmp = new Comparator<PackageParser.Package>() {

public int compare(PackageParser.Package p1, PackageParser.Package p2) {

return p1.mOverlayPriority - p2.mOverlayPriority;

}

};

Arrays.sort(overlayArray, cmp);

pkg.applicationInfo.resourceDirs = new String[overlayArray.length];

int i = 0;

for (PackageParser.Package p : overlayArray) {

pkg.applicationInfo.resourceDirs[i++] = p.baseCodePath;

}

return true;

}

=======

>>>>>>> 19df4b3... OMS-N: integrate OverlayManagerService into framework [6/14]

OK so failed as expected. But I did find this.. This is the error I get before I ever fix things..

[detached HEAD ebbf69e] OMS-N: introduce the OverlayManagerService [5/14]

Author: Mårten Kongstad <marten.kongstad@sonymobile.com>

Date: Tue Dec 15 16:40:23 2015 +0100

13 files changed, 2595 insertions(+)

create mode 100644 core/java/android/content/om/IOverlayManager.aidl

create mode 100644 core/java/android/content/om/OverlayInfo.aidl

create mode 100644 core/java/android/content/om/OverlayInfo.java

create mode 100644 services/core/java/com/android/server/om/IdmapManager.java

create mode 100644 services/core/java/com/android/server/om/OverlayManagerService.java

create mode 100644 services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

create mode 100644 services/core/java/com/android/server/om/OverlayManagerSettings.java

error: could not apply 19df4b3... OMS-N: integrate OverlayManagerService into framework [6/14]

hint: after resolving the conflicts, mark the corrected paths

And on this page it even says there is a conflict..

https://github.com/TeamSubstratumResources/platform_frameworks_base/commit/19df4b30ef07eeea063c1afe8a2204d75b0be696

I'm just not sure what i'm supposed to do lol.