commit e52b39ffb918b9cfca32262ca4659fc29be05bac
author vadimt <vadimt@google.com> Tue Jun 23 22:24:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 22:24:39 2020 +0000
tree faf8d1cabaf7934d1b973ef2fc160073deb192dd
parent 2f987f6466385a36b8d3bf29e568b1a16a3167cb
parent efa3acddba1845fa79570f900118542cf632e43a

Making LauncherProvider think that clear-db request comes from Launcher am: efa3acddba

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11975961

Change-Id: I232d640997772be013900c36aa82479b926016ca

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

diff --git a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
index 0b7d4bf..e649ce1 100644
--- a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
+++ b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Debug;
 import android.system.Os;
@@ -171,11 +172,16 @@
             }
 
             case TestProtocol.REQUEST_CLEAR_DATA: {
-                LauncherSettings.Settings.call(mContext.getContentResolver(),
-                        LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);
-                MAIN_EXECUTOR.submit(() ->
-                        LauncherAppState.getInstance(mContext).getModel().forceReload());
-                return response;
+                final long identity = Binder.clearCallingIdentity();
+                try {
+                    LauncherSettings.Settings.call(mContext.getContentResolver(),
+                            LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);
+                    MAIN_EXECUTOR.submit(() ->
+                            LauncherAppState.getInstance(mContext).getModel().forceReload());
+                    return response;
+                } finally {
+                    Binder.restoreCallingIdentity(identity);
+                }
             }
 
             default: