Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,333 Commits 3 Branches 0 Tags
4d686ad6dc283f2276d60c2cf3b831d153b1f71c
Commit Graph

649333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4d686ad6dc Merge "Fix --user parameter when setting app op for shell with shell command." into sc-dev am: 58f468f186 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15150888

Change-Id: I828151e3443cef60ddf9192708ab696d7738cc47
 2021-06-30 06:13:43 +00:00
TreeHugger Robot
58f468f186 Merge "Fix --user parameter when setting app op for shell with shell command." into sc-dev 2021-06-30 06:12:37 +00:00
James Lin
edc4341d3f Merge "[UCE] Set the default value of the list subscribe to false" into sc-dev am: 5f1dd57e55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126533

Change-Id: I4f8e9d4833f0db26b292b59e7c4b5798aaa4892a
 2021-06-30 06:12:36 +00:00
Tianjie Xu
47f52ba921 Merge "Update the owner file for recovery" am: da9b4de8f0 am: 6a871c97de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751540

Change-Id: Ib4451a8410db0d1414c9a3d4e8dd3b0174a8e8a2
 2021-06-30 05:57:47 +00:00
James Lin
5f1dd57e55 Merge "[UCE] Set the default value of the list subscribe to false" into sc-dev 2021-06-30 05:55:10 +00:00
Jackal Guo
6564e092b7 Merge "Move BootTest to internal test" into sc-dev am: 04a45607c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126448

Change-Id: Ib6be712e6a0a3199e62472a963aa08d6b455b140
 2021-06-30 05:42:03 +00:00
Riddle Hsu
7866acdd0a Merge "Return invalid task id if no acceptable target app" into sc-dev am: 397f6cdc5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126535

Change-Id: Id18e27ffc3db2e885c25a87f770437302f8dcd5d
 2021-06-30 05:41:29 +00:00
Jackal Guo
04a45607c1 Merge "Move BootTest to internal test" into sc-dev 2021-06-30 05:39:37 +00:00
Tianjie Xu
6a871c97de Merge "Update the owner file for recovery" am: da9b4de8f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751540

Change-Id: Id1860cfcad8f353b04f469c6a5cfbb3b71c01899
 2021-06-30 05:33:08 +00:00
Riddle Hsu
397f6cdc5e Merge "Return invalid task id if no acceptable target app" into sc-dev 2021-06-30 05:27:53 +00:00
Kyunglyul Hyun
4ac7a783f0 Merge "Hide non transferable routes" into sc-dev am: 88146b483b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909662

Change-Id: I595973d5819f238813643afd3f5a0e09788ee85b
 2021-06-30 05:21:37 +00:00
Tianjie Xu
da9b4de8f0 Merge "Update the owner file for recovery" 2021-06-30 05:18:34 +00:00
Kyunglyul Hyun
88146b483b Merge "Hide non transferable routes" into sc-dev 2021-06-30 05:06:54 +00:00
Evan Chen
485dac7c10 Merge "Fix adb command for multiple users" into sc-dev am: 38dfae8c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15129761

Change-Id: I9d296c448e022614c518c55911f9e7542859a770
 2021-06-30 04:07:40 +00:00
Evan Chen
38dfae8c31 Merge "Fix adb command for multiple users" into sc-dev 2021-06-30 03:55:11 +00:00
Hai Zhang
be06f0f221 Fix --user parameter when setting app op for shell with shell command. 
ag/13692058 added "com.android.shell" into resolveUid(), which is also
used by appops shell command. However unlike the other special UID
names (e.g. root, shell, media, audioserver), "com.android.shell" is a
regular package name, so this broke the assumption that the UIDs
returned from resolveUid() are all special UIDs that only runs in the
primary user, and made the shell command always set the package mode
for the com.android.shell package in primary user despite being given
an explicit --user parameter (see parserUserPackageOp()
implementation).

So the fix should be keeping the resolveUid()'s semantics and make it
only handle the special UID names instead of package names. For the
special case for shell in verifyAndGetBypass(), it can be done in that
method locally.

Bug: 187329570
Test: adb shell appops set --user 10 com.android.shell
      MANAGE_IPSEC_TUNNELS allow
Test: adb shell dumpsys appops | grep -5 shell
Change-Id: Ia3157d6fd45dad085fa672e385287817fa20e90b
 2021-06-30 03:37:00 +00:00
Jorge Gil
4d78e50f61 Merge "Check the min menu size when exp. to normal bounds" into sc-dev am: 47aa9f156e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144952

Change-Id: Ia71b09b4d17c648eb5c28d155f7b02ecc64b6f81
 2021-06-30 03:35:54 +00:00
Jorge Gil
47aa9f156e Merge "Check the min menu size when exp. to normal bounds" into sc-dev 2021-06-30 03:32:16 +00:00
Wei Sheng Shih
f73a7fd5ab Merge "Skip close activity transition since no closing app can be visible" into sc-dev am: 590ccb4e73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14842876

Change-Id: I2ce43931328ce728fe37d34a0417ca4afd4d32c9
 2021-06-30 03:31:12 +00:00
Wei Sheng Shih
590ccb4e73 Merge "Skip close activity transition since no closing app can be visible" into sc-dev 2021-06-30 03:23:04 +00:00
TreeHugger Robot
ad53af33ae Merge "Exempt default_input_method from BG-FGS-start restriction." into sc-dev am: 12ded20343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15137897

Change-Id: Ie043074bd9a6fdc8ba71a5da229da7134bee908d
 2021-06-30 03:05:37 +00:00
TreeHugger Robot
12ded20343 Merge "Exempt default_input_method from BG-FGS-start restriction." into sc-dev 2021-06-30 03:03:32 +00:00
Silin Huang
71ceda2729 Merge "Update wallet tile secondary label when QAW cards fetching in flight." into sc-dev am: ed6a76796f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15137138

Change-Id: I639fce3003d714c65fa719cecc9ef137a967aec3
 2021-06-30 02:42:00 +00:00
Silin Huang
ed6a76796f Merge "Update wallet tile secondary label when QAW cards fetching in flight." into sc-dev 2021-06-30 02:24:45 +00:00
Shan Huang
7199db597b Merge "Fix clock font weight animation to always match the latest doze state." into sc-dev am: be9f6e9bed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15135534

Change-Id: Ib337749f833b42fc54981f4b0f742c00e9ea4b85
 2021-06-30 02:18:24 +00:00
Shan Huang
be9f6e9bed Merge "Fix clock font weight animation to always match the latest doze state." into sc-dev 2021-06-30 01:58:04 +00:00
Zoey Chen
d06e555ebf Merge "[Telephony] Add description about location permission" into sc-dev am: fc3e38324f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14748170

Change-Id: Ia50752423926c3442a37e3e1f387bc4af146ab83
 2021-06-30 01:41:22 +00:00
Zoey Chen
fc3e38324f Merge "[Telephony] Add description about location permission" into sc-dev 2021-06-30 01:23:39 +00:00
TreeHugger Robot
7f7a4d5069 Merge "Improve javadocs for repeating alarms" into sc-dev am: 4260ce4100 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15147288

Change-Id: Iacf91c398261baa120766d440bf385f8f7e02106
 2021-06-30 01:05:33 +00:00
TreeHugger Robot
4260ce4100 Merge "Improve javadocs for repeating alarms" into sc-dev 2021-06-30 00:55:07 +00:00
TreeHugger Robot
46b26a50d0 Merge "Flush Content Capture context updated event immediately" into sc-dev am: 3a4b5e0817 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15096570

Change-Id: Iba764e748348e55553cb7b04ffbc47bfea95de11
 2021-06-30 00:51:44 +00:00
TreeHugger Robot
3a4b5e0817 Merge "Flush Content Capture context updated event immediately" into sc-dev 2021-06-30 00:49:26 +00:00
TreeHugger Robot
1f3e94f506 [automerger skipped] Merge "Remove SCHEDULE_EXACT_ALARM from Shell" into sc-dev am: 268e58afe4 -s ours 
am skip reason: Merged-In I98b051f37f3edf4f616f8847f691b956dafbdd12 with SHA-1 f199b66d36 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15147414

Change-Id: I182ad8fec98fd438c6c432a6be35fe7fa24ef7fc
 2021-06-30 00:47:39 +00:00
PETER LIANG
bb9115aa95 Merge "Extend to support the static and animated format image for IllustrationPreference." into sc-dev am: dc68f8f303 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079472

Change-Id: Ibf15a50454fd7540cd8ea0cd4ad9ab2e70d08e03
 2021-06-30 00:47:08 +00:00
TreeHugger Robot
268e58afe4 Merge "Remove SCHEDULE_EXACT_ALARM from Shell" into sc-dev 2021-06-30 00:42:40 +00:00
PETER LIANG
dc68f8f303 Merge "Extend to support the static and animated format image for IllustrationPreference." into sc-dev 2021-06-30 00:38:20 +00:00
Suprabh Shukla
94f5840bed Improve javadocs for repeating alarms 
Specifically, mentioning that the alarm count can only be included with
the alarm if the supplied pending intent is mutable.

Test: make offline-sdk-docs

Fixes: 178413211
Change-Id: I2914bceebeed8b52b0de11d70960aa33e6837b13
 2021-06-29 17:34:14 -07:00
Silin Huang
3d86d270cb Update wallet tile secondary label when QAW cards fetching in flight. 
Also re-create the QAW client if the wallet feature is unavailable; and query the wallet cards only when the wallet feature is available.

Test: atest
Test: manual
Bug: 190036483
Change-Id: Ibad3429a6f77d3f8a474b577759e7b7193ad6f23
 2021-06-30 00:07:21 +00:00
TreeHugger Robot
156829bd80 Merge "Double DEFAULT_MAX_LABEL_SIZE_PX to 1000px" into sc-dev am: a46f524537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15143634

Change-Id: I73e80ffb8b5afde1d364fabae175555bdbaa9f5d
 2021-06-29 23:51:31 +00:00
TreeHugger Robot
a46f524537 Merge "Double DEFAULT_MAX_LABEL_SIZE_PX to 1000px" into sc-dev 2021-06-29 23:36:33 +00:00
Suprabh Shukla
d50bc69f94 Remove SCHEDULE_EXACT_ALARM from Shell 
Shell doesn't need this permission and it confusing to the user
if visible in Settings.

Test: Shell doesn't appear in Settings under
Settings -> Apps -> Special app access -> Alarms & Reminders ->
3 dot menu -> Show system

Bug: 190775895
Change-Id: I98b051f37f3edf4f616f8847f691b956dafbdd12
Merged-In: I98b051f37f3edf4f616f8847f691b956dafbdd12
 2021-06-29 16:27:28 -07:00
Paul Duffin
47516b61fd Merge "Move tethering related hidden API flag file entries to packages/modules/Connectivity/Tethering" into sc-dev am: 8c37e55416 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132974

Change-Id: I1c235e41bcc00554c4d9350157309e9c9912fc1d
 2021-06-29 22:57:10 +00:00
Paul Duffin
8c37e55416 Merge "Move tethering related hidden API flag file entries to packages/modules/Connectivity/Tethering" into sc-dev 2021-06-29 22:54:01 +00:00
Huihong Luo
06f4d0f3c3 Merge "Reparent surface control for Webview overlay" into sc-dev am: 4d7a36be41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106351

Change-Id: I3a097b69f97d18cdae6a66b899a391d7f4d6a3d5
 2021-06-29 22:53:38 +00:00
Paul Duffin
9a51621d23 Merge "Enable appsearch to perform its own hidden API processing" into sc-dev am: 56dc119776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114531

Change-Id: I5773739b4c8d72882f3bf05d2a9161d092548d3b
 2021-06-29 22:52:59 +00:00
Huihong Luo
4d7a36be41 Merge "Reparent surface control for Webview overlay" into sc-dev 2021-06-29 22:38:17 +00:00
Paul Duffin
56dc119776 Merge "Enable appsearch to perform its own hidden API processing" into sc-dev 2021-06-29 22:37:46 +00:00
TreeHugger Robot
27b7492e5a [automerger skipped] Merge "Use IntentFilter CREATOR directly for serializing ParsedIntentInfo" into rvc-dev am: a29bdb9e0d am: 1928716b32 -s ours am: 0221168d9d -s ours 
am skip reason: Merged-In Ib12e0a959eb5a5d73d5832ff2eee26a30eed5ded with SHA-1 7ac9b1da73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110948

Change-Id: I4f289ec4a0bdcbc4b82e4c83d0cb1c7ccea6507b
 2021-06-29 22:12:41 +00:00
TreeHugger Robot
d50d0d99be [automerger skipped] Merge "Use IntentFilter CREATOR directly for serializing ParsedIntentInfo" into rvc-dev am: a29bdb9e0d am: eaafd6fc7e -s ours am: d0caba39cc -s ours 
am skip reason: Merged-In Ib12e0a959eb5a5d73d5832ff2eee26a30eed5ded with SHA-1 f344cfad2b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110948

Change-Id: I068f2e36bbb4a6ad3ee51c83f6c9ef5425288e8b
 2021-06-29 22:12:31 +00:00
Kevin Chyn
ad9dc6e0eb Merge "Add logging for AuthSession cancellation path" into sc-dev am: 34944f74c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15145669

Change-Id: Id29dd40b30c5dfbcf7cc70790696e749bccd92f9
 2021-06-29 22:11:33 +00:00