Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6c187dd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7408768 from 0a40c03e to sc-d1-release 

Change-Id: I4ec307b3f0fe6f761985d7bd65a0dfc782537d8e
parents 00d9b414 0a40c03e

apct-tests/perftests/multiuser/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 




    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

apex/appsearch/framework/java/android/app/appsearch/AppSearchManager.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.appsearch; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.SystemService;

import android.annotation.UserHandleAware;

import android.app.appsearch.aidl.IAppSearchManager;

import android.content.Context;
@@ -195,6 +196,7 @@ public class AppSearchManager { 
     *     this operation. Or a {@link AppSearchResult} with failure reason code and error

     *     information.

     */

    @UserHandleAware

    public void createSearchSession(

            @NonNull SearchContext searchContext,

            @NonNull @CallbackExecutor Executor executor,
@@ -222,6 +224,7 @@ public class AppSearchManager { 
     *     this operation. Or a {@link AppSearchResult} with failure reason code and error

     *     information.

     */

    @UserHandleAware

    public void createGlobalSearchSession(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull Consumer<AppSearchResult<GlobalSearchSession>> callback) {

cmds/idmap2/libidmap2/ResourceContainer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ ApkResourceContainer::ApkResourceContainer(std::unique_ptr<ZipAssetsProvider> zi 


Result<std::unique_ptr<ApkResourceContainer>> ApkResourceContainer::FromPath(

    const std::string& path) {

  auto zip_assets = ZipAssetsProvider::Create(path);

  auto zip_assets = ZipAssetsProvider::Create(path, 0 /* flags */);

  if (zip_assets == nullptr) {

    return Error("failed to load zip assets");

  }

cmds/idmap2/tests/XmlParserTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
namespace android::idmap2 {



Result<XmlParser> CreateTestParser(const std::string& test_file) {

  auto zip = ZipAssetsProvider::Create(GetTestDataPath() + "/target/target.apk");

  auto zip = ZipAssetsProvider::Create(GetTestDataPath() + "/target/target.apk", 0 /* flags */);

  if (zip == nullptr) {

    return Error("Failed to open zip file");

  }

core/java/android/app/LoadedApk.java

+11 −6
Original line number Diff line number Diff line
@@ -1289,6 +1289,10 @@ public final class LoadedApk { 
                throw new AssertionError("null split not found");

            }



            if (Process.myUid() == mApplicationInfo.uid) {

                ResourcesManager.getInstance().initializeApplicationPaths(mResDir, splitPaths);

            }



            mResources = ResourcesManager.getInstance().getResources(null, mResDir,

                    splitPaths, mLegacyOverlayDirs, mOverlayPaths,

                    mApplicationInfo.sharedLibraryFiles, null, null, getCompatibilityInfo(),
@@ -2056,7 +2060,7 @@ public final class LoadedApk { 
            }

            if (dead) {

                mConnection.onBindingDied(name);

            }

            } else {

                // If there is a new viable service, it is now connected.

                if (service != null) {

                    mConnection.onServiceConnected(name, service);
@@ -2065,6 +2069,7 @@ public final class LoadedApk { 
                    mConnection.onNullBinding(name);

                }

            }

        }



        public void doDeath(ComponentName name, IBinder service) {

            synchronized (this) {