aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix Launcher3 issues due to hardcoded default user" into udc-qpr-dev am: fbb34d205a am: 09e2dc9d6c

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

Change-Id: I292111cf0d35846f7390257d6a3c4cd90e10d16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anna Bauza
2023-06-23 00:09:58 +00:00
committed by Automerger Merge Worker
parent f0b01b39df 09e2dc9d6c
commit e87c17c460
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/src/com/android/launcher3/util/TestUtil.java
View File

@@ -67,11 +67,11 @@ public class TestUtil {
private static final String TAG = "TestUtil";
public static final String DUMMY_PACKAGE = "com.example.android.aardwolf";
public static final int DEFAULT_USER_ID = 0;
public static final long DEFAULT_UI_TIMEOUT = 10000;
public static void installDummyApp() throws IOException {
installDummyAppForUser(DEFAULT_USER_ID);
final int defaultUserId = getMainUserId();
installDummyAppForUser(defaultUserId);
}
public static void installDummyAppForUser(int userId) throws IOException {
@@ -106,6 +106,23 @@ public class TestUtil {
}
}
/**
* Returns the main user ID. NOTE: For headless system it is NOT 0. Returns 0 by default, if
* there is no main user.
*
* @return a main user ID
*/
public static int getMainUserId() throws IOException {
Instrumentation instrumentation = getInstrumentation();
final String result = UiDevice.getInstance(instrumentation)
.executeShellCommand("cmd user get-main-user");
try {
return Integer.parseInt(result.trim());
} catch (NumberFormatException e) {
return 0;
}
}
/**
* Utility class to override a boolean flag during test. Note that the returned SafeCloseable
* must be closed to restore the original state