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

Commit 6d37935a authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Use user context to support multiuser use case" am: fcfd6a1f am: f651b3f7 

Change-Id: I244ecc0be709dece6d0a40dcba511faabb318b66
parents fe039f0f f651b3f7

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+4 −2
Original line number Diff line number Diff line
@@ -494,8 +494,10 @@ public class AdapterService extends Service { 
        }.execute();



        try {

            int systemUiUid = getApplicationContext().getPackageManager().getPackageUid(

                    "com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY);

            int systemUiUid = getApplicationContext()

                    .createContextAsUser(UserHandle.SYSTEM, /* flags= */ 0)

                    .getPackageManager()

                    .getPackageUid("com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY);



            Utils.setSystemUiUid(systemUiUid);

        } catch (PackageManager.NameNotFoundException e) {

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Looper; 
import android.os.PowerManager;

import android.os.Process;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.test.mock.MockContentResolver;

import android.util.Log;
@@ -132,6 +133,8 @@ public class AdapterServiceTest { 
        when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);

        when(mMockContext.createContextAsUser(UserHandle.SYSTEM, /* flags= */ 0)).thenReturn(

                mMockContext);

        when(mMockContext.getResources()).thenReturn(mMockResources);

        when(mMockContext.getUserId()).thenReturn(Process.BLUETOOTH_UID);

        when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);