diff options
| author | Winson <chiuwinson@google.com> | 2019-06-07 14:44:40 -0700 |
|---|---|---|
| committer | Winson <chiuwinson@google.com> | 2019-06-07 15:09:06 -0700 |
| commit | f27394ee70bca1a3848793497cc826db7aaa82a5 (patch) | |
| tree | a2ed31e9f0beffd9a8dd758b924cab11baaf7b66 /core/java/android/permission/PermissionManager.java | |
| parent | b613fec2f895aa1d0cb71080eb741d757551dbef (diff) | |
Expose PermissionManager as TestApi and fix SplitPermissionInfo equality
Bug: 129200416
Bug: 129200610
Test: atest SplitPermissionsTest
Change-Id: I98795944e6440e5b7ebba134bd7735a6f78ebc4f
Diffstat (limited to 'core/java/android/permission/PermissionManager.java')
| -rw-r--r-- | core/java/android/permission/PermissionManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index e15659db90a8..182a2ffa5221 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -39,6 +39,7 @@ import java.util.Objects; * * @hide */ +@TestApi @SystemApi @SystemService(Context.PERMISSION_SERVICE) public final class PermissionManager { @@ -140,12 +141,13 @@ public final class PermissionManager { if (o == null || getClass() != o.getClass()) return false; SplitPermissionInfo that = (SplitPermissionInfo) o; return mTargetSdk == that.mTargetSdk - && Objects.equals(mSplitPerm, that.mSplitPerm); + && mSplitPerm.equals(that.mSplitPerm) + && mNewPerms.equals(that.mNewPerms); } @Override public int hashCode() { - return Objects.hash(mSplitPerm, mTargetSdk); + return Objects.hash(mSplitPerm, mNewPerms, mTargetSdk); } /** |