Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
740,528 Commits 3 Branches 0 Tags
aec1bdf2ac0d131ce4c4e3955aba0df52f0bf310
Commit Graph

421 Commits

Author SHA1 Message Date
Lee Shombert
0cece3898b Prepare PropertyInvalidatedCache for SystemApi 
Bug: 152453213
Tag: #refactor

This commit prepares PropertyInvalidatedCache to function as a system
api.  Specifically, the methods recompute() and bypass() which may be
overridden by clients are now public (instead of protected).  This
forces an update to all existing clients, to accommodate the change in
method visibility.

Two small changes have been made as cleanup:

 1. The awkwardly named debugCompareQueryResults() is now
    resultEquals(), which is more or less consistent with how other
    equality tests are named in Android.  This name change affects two
    clients.

 2. PackageManager has changed to use resultEquals() instead of
    maybeCheckConsistency().  This provides a simpler and more
    consistent use of the APIs.  maybeCheckConsistency() has been made
    private.

Test: atest PropertyInvalidatedCacheTests

Change-Id: I4110f8e887a4fd8c784141e8892557a9d1b80a94
 2022-01-04 08:13:59 -08:00
Dmitry Dementyev
4361f23443 Remove account name from logs in ChooseAccount activities. 
Test: manual
Bug: 207388203, 205130113
Change-Id: I25eeaa9e7f0b79703949bd91eb8cca04034e5ba7
 2021-12-23 14:38:38 -08:00
Lei Ju
a88b7fe6a8 Fixes an NPE caused by null sequence. 
Test: existing CTS tests
Bug: 182164206
Change-Id: Ia2855a4df24e53710fac29242aafc25bd8e32578
 2021-10-18 14:44:59 -07:00
Treehugger Robot
38934602d3 Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b am: c6a9f2e81c am: 48cecd59d5 am: d9f8d109dc am: 975e9651d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: I7e33663db36e5f2060f222715d90ddfff7b1574c
 2021-08-17 12:58:25 +00:00
Treehugger Robot
48cecd59d5 Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b am: c6a9f2e81c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: Ifd1c48036dbc7f7a48ae24ce13553f71f1eb794c
 2021-08-17 12:17:32 +00:00
Jooyung Han
fb8ebe9f44 Suppress AIDL warnings: untyped-collection 
For now AIDL doesn't support Map<String,Integer>, there's no way to fix
it with typed map.

Bug: 192615532
Test: m
Change-Id: Id0011372a0997b4ab9aa700a7c4f8746bff29189
 2021-08-12 17:30:32 +09:00
Lee Shombert
1171265b9d Merge changes I68868b7f,I092d1385 
* changes:
  Do not cache wildcard users (UserManager)
  Do not cache wildcard users (PackageManager)
 2021-07-21 23:07:00 +00:00
Lee Shombert
f7067b2477 Do not cache wildcard users (UserManager) 
Bug: 186778818

PropertyInvalidatedCache queries that contain wildcard user IDs are no
longer cached.  Some simple multi-user tests show that no current
caches use wildcard user IDs, so the change has no effect on
performance.  The bypass() mechanism is used to avoid the cache when
necessary.

Test: atest
 * FrameworksServicesTests:UserManagerServiceCreateProfileTest
Change-Id: I68868b7f4142417d98b101504cb38c829b220e47
 2021-07-20 10:53:37 -07:00
Dmitry Dementyev
f67e4d7145 Use correct intent key in AbstractAccountAuthenticator JavaDoc. 
Test: not needed
Bug: 136458050
Change-Id: I0f0b171d627eeb35f78f541b5a6317f6f82cafc6
 2021-07-19 13:26:19 -07:00
Jeff Sharkey
3fdff5ffba Merge "Update owners of Accounts subsystem." am: 7b9662e70b am: ba649ca98d am: d89db71a24 am: 0a0ffb2839 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734374

Change-Id: Iac528a6d10f49deb1430bd697883f0db2ba594eb
 2021-06-11 17:24:13 +00:00
Jeff Sharkey
d89db71a24 Merge "Update owners of Accounts subsystem." am: 7b9662e70b am: ba649ca98d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734374

Change-Id: I46c573107f841687d48a8a725a979948cb4a8964
 2021-06-11 17:07:50 +00:00
Jeff Sharkey
55b908c8fe Update owners of Accounts subsystem. 
Bug: 174932174
Change-Id: Ia9e2566cf3279b5b8364de02989a247f0414f485
Test: none
 2021-06-11 12:28:39 +00:00
Aseem Kumar
11053c17b3 Prevent apps from spamming addAccountExplicitly. 
See comment here for the discussion on solution
https://b.corp.google.com/issues/169762606#comment14

Change-Id: If212df3a3b7be1de0fb26b8e88b2fcbb8077c253

Bug: 169762606
 2021-06-01 10:12:51 +00:00
kholoud mohamed
a74b54f7f9 Add metrics in AccountManager 
Add metrics for addAccount, addAccountExplicitly,
startAddAccountSession, and getAuthToken

Bug: 182980755
Test: verified manually using
make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 103

Change-Id: I6cc0f9cb7a4b1e53d22ddcef0f03e7d42587b42e
 2021-04-29 12:01:58 +01:00
Xin Li
4bbe2a2df3 Merge RQ2A.210305.007 into stage. 
Bug: 180401296
Merged-In: I1a16808426934f4a8d12410576d769443e4c2a04
Change-Id: I247a99c33c62cd1d000b7e50d1dda8b14df229d7
 2021-03-01 01:06:43 -08:00
Philip P. Moltmann
8d6a0cb6af Merge "Remove me from OWNERS files" am: 25ee5a7fb7 am: bf8de269cb am: 39198ddd84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I429557a8537fb6417fcb9539978964ade75c8dee
 2021-02-11 23:15:42 +00:00
Philip P. Moltmann
39198ddd84 Merge "Remove me from OWNERS files" am: 25ee5a7fb7 am: bf8de269cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe2c5fd92070b1aebdc46755c8667b3ed22348ab
 2021-02-11 22:57:48 +00:00
Philip P. Moltmann
a8eb3d3e69 Remove me from OWNERS files 
Test: n/a
Change-Id: I6113011e6ab0997285d5b7a86303fc60a3b98a2b
Exempt-From-Owner-Approval: Previously approved
 2021-02-11 22:28:43 +00:00
Dmitry Dementyev
169f089a26 Protect account chooser activities against overlay. 
Bug: 172841550
Test: manual
Change-Id: I1a16808426934f4a8d12410576d769443e4c2a04
Merged-In: I3cd5a94386f15cf60a7fe3095b00815e4a6485ae
(cherry picked from commit 6ff42dd2d2)
 2021-01-12 04:53:53 +00:00
TreeHugger Robot
3bd551ede2 Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e am: 88e38a7d1c am: 37ff5c9d04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b0f76a2f9ea938e219a00e46e103c915bd5c739
 2021-01-07 00:18:59 +00:00
TreeHugger Robot
be186dc33e Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9307ed863c033d169fb91994e976a94ca9267bf0
 2021-01-06 22:51:18 +00:00
TreeHugger Robot
683623e8b0 Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f86ac2f6302f63f1dc3d11d93c1a99434ec4fb6
 2021-01-06 22:15:09 +00:00
Bill Yi
2dcac1e2a1 Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE 
Merged-In: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70
Change-Id: I329407db7c9ed7d2b512e505df6e50c4f471fafa
 2021-01-05 18:27:51 -08:00
Matt Pape
c34dcb8031 Merge "Update AbstractAccountAuthenticator to call out the caveat in addAccount that requires synchronous execution." 2020-12-16 20:25:07 +00:00
Matt Pape
8ebfc33d17 Update AbstractAccountAuthenticator to call out the caveat in addAccount that requires synchronous execution. 
Bug: 175382142
Change-Id: I5c2032e91c47d8cd78e9d2c110737d8ad9ba2749
 2020-12-14 23:06:55 +00:00
Dmitry Dementyev
6ff42dd2d2 Protect account chooser activities against overlay. 
Bug: 172841550
Test: manual
Change-Id: I1a16808426934f4a8d12410576d769443e4c2a04
Merged-In: I3cd5a94386f15cf60a7fe3095b00815e4a6485ae
 2020-12-14 09:08:42 -08:00
Dmitry Dementyev
7563c0bb5b Protect account chooser activities against overlay. 
Bug: 172841550
Test: manual
Change-Id: I3cd5a94386f15cf60a7fe3095b00815e4a6485ae
 2020-12-14 08:18:26 -08:00
Riddle Hsu
f90b2d4610 Move launched activity info getter to ActivityClientController 
- Add getLaunchedFromUid and getLaunchedFromPackage into Activity
  because they are used in several places.
- Move getActivityClassForToken to ActivityTaskManagerInternal#
  getActivityName because it is only used in system server.
- Remove getPackageForToken because it is no longer used.

Bug: 174041144
Bug: 174040691
Test: CtsWindowManagerDeviceTestCases

Change-Id: Iac1581ac2271baf1ab1625ced6cc1f42bf05eaf5
 2020-12-08 13:10:10 +08:00
Dmitry Dementyev
0b610a27ba Ignore GrantCredentials call with unexpected calling uid. 
Activity can be used only in two cases.
1) Calling uid matches uid grantee.
2) Calling uid is is system. This flow is used by getToken methods with
notifyAuthFailure=true.

Test: Existing CTS tests
Bug: 158480899
Change-Id: I1421c333b6cebb4f7cddcdd8766298f6872e933b
(cherry picked from commit 10d8a114bb)
 2020-11-18 22:51:31 +00:00
Dmitry Dementyev
828fe0b915 Protect GrantCredentialsPermissionActivity against overlay. 
Bug: 169763814
Test: manual
Change-Id: I15dd22791fcc61ef02b06ad51d9e4409d11c0181
(cherry picked from commit f45dcfe1f5)
 2020-11-18 22:51:28 +00:00
Dmitry Dementyev
8eeeef38d2 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: de121ad5cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: I03d5431b03bd40ce5a72f385b382f1a62f4158b0
 2020-11-11 23:17:03 +00:00
Dmitry Dementyev
f22196b923 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: If6ed2031eb08dc339a225b184b80d6403e6fad2a
 2020-11-11 23:16:34 +00:00
Dmitry Dementyev
4290008125 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: If1903ef712d1d297cea648a6d78213127ddd3fd6
 2020-11-11 22:01:38 +00:00
Dmitry Dementyev
f0263a9369 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: Ibf0233c8e736166a6357d622a5f5763cca64c07a
 2020-11-11 21:41:34 +00:00
Dmitry Dementyev
a064b69f18 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev 2020-11-11 21:10:46 +00:00
Dmitry Dementyev
e174252a72 Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 am: 765788de9a am: 364db883ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: I0e002fdc58070bdb780bd33b7aea90f95d58436b
 2020-11-11 06:57:57 +00:00
Dmitry Dementyev
85e5d308e8 Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 am: 765788de9a am: 3be814cbff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: Ic7e3689b65a2cf9edba1355eed3daa6a0647b3cf
 2020-11-11 06:57:46 +00:00
Dmitry Dementyev
765788de9a Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: I59ea6157c2646c0398111718cff4af51cd4245d8
 2020-11-11 06:14:33 +00:00
Dmitry Dementyev
3f47c701f1 Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: I5259ff89a5491f6cf3c5bb0eeb12fb66ef47d494
 2020-11-11 06:00:59 +00:00
Dmitry Dementyev
10d8a114bb Ignore GrantCredentials call with unexpected calling uid. 
Activity can be used only in two cases.
1) Calling uid matches uid grantee.
2) Calling uid is is system. This flow is used by getToken methods with
notifyAuthFailure=true.

Test: Existing CTS tests
Bug: 158480899
Change-Id: I1421c333b6cebb4f7cddcdd8766298f6872e933b
 2020-11-10 16:05:58 -08:00
Dmitry Dementyev
c9d29066bd Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 am: 427ee435bd am: 5c9473a962 am: c91980e20e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I2d5424f4ac3a53a58ed8779b66d2d93c3670e60f
 2020-11-11 00:03:02 +00:00
Dmitry Dementyev
e8e9404470 Revert "Ignore GrantCredentials call with unexpected calling uid." 
This reverts commit bbdc83188e.

Reason for revert: Fix works fine on master, reverting the change and applying again will simplify automerger flow for proper fix.
Bug: 172932743

Change-Id: Id498e952a7e883e2d6b7fe0d4000fb3415486d85
 2020-11-10 23:24:27 +00:00
Dmitry Dementyev
5c9473a962 Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 am: 427ee435bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I7a2396510c5333088d5c8e16dbb277c3b895e3ce
 2020-11-10 23:15:07 +00:00
Dmitry Dementyev
f45dcfe1f5 Protect GrantCredentialsPermissionActivity against overlay. 
Bug: 169763814
Test: manual
Change-Id: I15dd22791fcc61ef02b06ad51d9e4409d11c0181
 2020-11-10 22:43:31 +00:00
Dmitry Dementyev
427ee435bd Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I472f2b6180738e11cc0747db1b0fd4789b0ae721
 2020-11-10 22:41:05 +00:00
Dmitry Dementyev
1d3492e181 Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I25446d7e0cb9eec2b98cf630bd85db30a007f6a0
 2020-11-10 22:23:04 +00:00
Dmitry Dementyev
888ba5ee1a Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev 2020-11-10 21:44:51 +00:00
Dmitry Dementyev
c1097a8488 Revert "Ignore GrantCredentials call with unexpected calling uid." 
This reverts commit 4f0084580d.

Reason for revert: Build breakage - b/172932743

Bug: 172932743
Change-Id: Iee0a5e2b84e5d89a206b099f75a15e714a332ff4
 2020-11-10 21:44:34 +00:00
TreeHugger Robot
b2f3dc0083 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I72a0a54f22b8ebd457db1c7fa8b3757bc1f0f327
 2020-11-10 20:25:01 +00:00
TreeHugger Robot
e0efbc5fbb Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I0e4803e7aafd730b9e21e49dc350ee51eedf42d8
 2020-11-10 19:56:49 +00:00