From c3d29ebf21d3d168374b3f083832eb6a05146401 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 29 Mar 2016 14:29:55 -0700 Subject: [PATCH] Refactored method to get UIDs. BUG: 27904062 Change-Id: Ib0d3911f40e0a5deed833f71e75abd10a224768f --- .../AbstractRestrictBackgroundNetworkTestCase.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index adaaf84848..824624313b 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -82,9 +82,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation mContext = mInstrumentation.getContext(); mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); mWfm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); - mUid = mContext.getPackageManager().getPackageInfo(TEST_APP2_PKG, 0).applicationInfo.uid; - final int myUid = mContext.getPackageManager() - .getPackageInfo(mContext.getPackageName(), 0).applicationInfo.uid; + mUid = getUid(TEST_APP2_PKG); + final int myUid = getUid(mContext.getPackageName()); Log.d(TAG, "UIDS: test app=" + myUid + ", app2=" + mUid); } @@ -98,6 +97,10 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation } } + protected int getUid(String packageName) throws Exception { + return mContext.getPackageManager().getPackageUid(packageName, 0); + } + protected void assertRestrictBackgroundChangedReceived(int expectedCount) throws Exception { assertRestrictBackgroundChangedReceived(DYNAMIC_RECEIVER, expectedCount); assertRestrictBackgroundChangedReceived(MANIFEST_RECEIVER, 0);