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

Commit 4f958b1b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7553867 from 2db6435b to sc-release 

Change-Id: Ib76723a127ed47504743a934b4a0986d7f001771
parents 0cf0aea0 2db6435b

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7533747"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7533747"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7533747"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+3 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7533747"

    build_id: "7552332"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -10,4 +10,6 @@ drops { 
  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

}

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ public class AppSearchManagerService extends SystemService { 
                    AppSearchUserInstance instance =

                            mAppSearchUserInstanceManager.getUserInstance(callingUser);

                    SearchResultPage searchResultPage =

                            instance.getAppSearchImpl().getNextPage(nextPageToken);

                            instance.getAppSearchImpl().getNextPage(packageName, nextPageToken);

                    invokeCallbackOnResult(

                            callback,

                            AppSearchResult.newSuccessfulResult(searchResultPage.getBundle()));
@@ -821,7 +821,7 @@ public class AppSearchManagerService extends SystemService { 
                    verifyNotInstantApp(userContext, packageName);

                    AppSearchUserInstance instance =

                            mAppSearchUserInstanceManager.getUserInstance(callingUser);

                    instance.getAppSearchImpl().invalidateNextPageToken(nextPageToken);

                    instance.getAppSearchImpl().invalidateNextPageToken(packageName, nextPageToken);

                } catch (Throwable t) {

                    Log.e(TAG, "Unable to invalidate the query page token", t);

                }
@@ -871,7 +871,7 @@ public class AppSearchManagerService extends SystemService { 
                                                .getGenericDocument().getBundle());

                            }

                            searchResultPage = instance.getAppSearchImpl().getNextPage(

                                    searchResultPage.getNextPageToken());

                                    packageName, searchResultPage.getNextPageToken());

                        }

                    }

                    invokeCallbackOnResult(callback, AppSearchResult.newSuccessfulResult(null));