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

649706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
91104ba033 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a1d8e8049d763bac5e83d7ef65c95d5b7209258
 2021-10-18 08:19:55 +00:00
TreeHugger Robot
6e2bdea60b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:06:06 +00:00
TreeHugger Robot
3996156430 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:04:42 +00:00
TreeHugger Robot
c499631f1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-18 08:03:55 +00:00
TreeHugger Robot
b93235188a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:03:53 +00:00
TreeHugger Robot
151103c757 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bb0d270c5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bbc71ee0a1b65ba67ccfa0f9150204296fee1ae
 2021-10-15 22:09:34 +00:00
TreeHugger Robot
bb0d270c5c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-15 21:54:55 +00:00
TreeHugger Robot
9212972645 Merge "[RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog" into sc-qpr1-dev 2021-10-15 21:09:55 +00:00
Nader Jawad
220896c23f [automerger skipped] Merge changes I2440a161,I3e478b11 into sc-dev am: ce6d9b4261 -s ours 
am skip reason: Merged-In I2440a161c70076850479c562c7c9e6dc8d756236 with SHA-1 74eaabead9 is already in history

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

Change-Id: I782e9fa192828095dbef24d8ccfefe66c47c5d6d
 2021-10-15 18:57:10 +00:00
Nader Jawad
ce6d9b4261 Merge changes I2440a161,I3e478b11 into sc-dev 
* changes:
  Fix initialization of snapshot SkImage instance
  Conditionally cache RenderEffect results
 2021-10-15 18:42:22 +00:00
Bill Yi
7e142ec17b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I906d64bc6ec9001b40af4cf4d90c9f4ca45aca89
 2021-10-15 17:19:19 +00:00
TreeHugger Robot
5f5ed92f58 Merge "Update the BroadcastQueue logic for runtime permissions" into sc-qpr1-dev 2021-10-15 17:14:01 +00:00
Bill Yi
4d726b52e5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a4d990e32f37b5e11bc78d5e6e6a2c1aab00707
 2021-10-15 16:39:20 +00:00
Bill Yi
6603d5c02f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iea299c6e217136421612b9b3f44672a70b5d4b42
 2021-10-15 16:37:13 +00:00
TreeHugger Robot
9e22069bf0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-15 14:26:42 +00:00
Bill Yi
02d8856a63 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieb52c14a026b1597b31b3261b8bdea968950b260
 2021-10-15 13:16:23 +00:00
Bill Yi
0cafea50ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18901232690d8e415369655a9b25b0ebcc3bb54f
 2021-10-15 03:56:42 +00:00
Bill Yi
ce6bb0196b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e5713a1d25c4054e7f8f430a68a0544a4ff18f2
 2021-10-15 03:52:34 +00:00
Ashwini Oruganti
400ff61cff Update the BroadcastQueue logic for runtime permissions 
Previously, we were skipping a broadcast when either the permission or
the app op was granted. However, for runtime permissions to be
considered "granted" both the permission and the app op need to be
granted. This change updates taking this into account.

Test: manual
Bug: 202436287
Bug: 183537857
Change-Id: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf
Merged-In: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf
(cherry picked from commit 1e6a968126)
 2021-10-15 01:19:42 +00:00
TreeHugger Robot
80de4b8d1c [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: I9ecb33a8ccc0f97617d48f5ff1e25ef57ae3970c
 2021-10-14 23:04:11 +00:00
TreeHugger Robot
c8aacc1e15 [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: Iec2e808c5f377429378e4f1d6dd4fb0a7f15cdf1
 2021-10-14 23:04:03 +00:00
TreeHugger Robot
63c010460d [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: I5c653d3d75eb94c07d79a6f50157e9ed6e5e8088
 2021-10-14 22:54:29 +00:00
TreeHugger Robot
241c81a614 [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: I1090649f7622af8613a34a1fce70cfbd3241953c
 2021-10-14 22:53:00 +00:00
TreeHugger Robot
6071b11999 [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: Ibcefc625d834c5d00275551ca20b164c77169052
 2021-10-14 22:37:10 +00:00
TreeHugger Robot
7dacb9fb5e [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: Ice9c20b9018cead99a36c4126086fe360346516c
 2021-10-14 22:37:09 +00:00
TreeHugger Robot
e3d406ab9a [automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours 
am skip reason: skipped by user joshtrask

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

Change-Id: I3398972f2772e2a688d391b246bc9b121f7ea204
 2021-10-14 22:18:42 +00:00
Nader Jawad
78b18bb2aa Fix initialization of snapshot SkImage instance 
Fix issue where the initial snapshot used to create a
resultant SkImage instance with an SkImageFilter applied
was not initialized.

Fixes: 201312688
Test: Re-ran CTS tests
Change-Id: I2440a161c70076850479c562c7c9e6dc8d756236
Merged-In: I2440a161c70076850479c562c7c9e6dc8d756236
 2021-10-14 06:28:40 +00:00
Nader Jawad
10f05d8f00 Conditionally cache RenderEffect results 
Added property to conditionally cache SkImage instances
with SkImageFilters applied. Some GL vendor implementations
invoke Fence::waitForver without signalling, leading
to ANRs throughout the system.

Bug: 193145089
Test: manual
Change-Id: I3e478b11b66205d96e9499a362f7412a1d6e952d
Merged-In: I3e478b11b66205d96e9499a362f7412a1d6e952d
 2021-10-14 06:25:55 +00:00
Weng Su
8c0847b0fe [RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog 
- Show message when Wi-Fi is OFF and Wi-Fi Scanning is ON
  - Don't show message when device is locked

- Show a "Change" link to launch Wi-Fi Scanning Settings

Bug: 202323013
Test: manual test to verify on the device.
atest -c InternetDialogControllerTest \
         InternetDialogTest

Change-Id: I5eb4563a69e85050532c8b4fe3748e01cc7d9ca5
 2021-10-13 18:31:57 +00:00
TreeHugger Robot
626348ae43 Merge "[RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog)" into sc-qpr1-dev 2021-10-13 17:35:34 +00:00
TreeHugger Robot
faef08cff7 Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-qpr1-dev 2021-10-13 16:28:17 +00:00
Weng Su
6baf1dad31 [RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog) 
Bug: 202323013
Test: add new string only, unnecessary to test.
Change-Id: I54bc60793f317390a78ce1e9dc96ee31c861ad63
 2021-10-13 13:56:33 +00:00
TreeHugger Robot
7c3a3539f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5a4e57d0ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I353acca24cdd094b9368b64f46d27d41168260b8
 2021-10-13 13:37:22 +00:00
Bill Yi
2ea7d3a788 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7936d8bdfe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib92952744abfbba772dc062672213d069a67f8da
 2021-10-13 13:37:18 +00:00
Collin Fijalkovich
454b408991 [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 am: 157dea0ce9 -s ours am: 99338cc865 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I2ccffdd80181b9783d69f52dc2ce84df9e79f620
 2021-10-13 13:37:16 +00:00
Collin Fijalkovich
7815edd7e8 [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours am: 80a149a827 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I4d342013155abaf23659660002d318adb139d144
 2021-10-13 13:37:13 +00:00
Collin Fijalkovich
f34f93b815 [automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours am: 4f30365204 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1fd2 is already in history

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

Change-Id: I214a2b0bd19acd8f1e3f8ac2a0c35a15183bbb76
 2021-10-13 13:37:10 +00:00
TreeHugger Robot
ede98406f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I003ded34ae1620cc92d6b907ce8f0bc8dbcfbbd7
 2021-10-13 13:37:07 +00:00
TreeHugger Robot
66d3add4fc Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Id6df043842b9cb84ebe98ada4f39b0e28a3a4f88
 2021-10-13 13:36:40 +00:00
Josh Tsuji
cb17c9d93c [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I3e7e18f6c023842eb6de84845246c0a66ff012f0
 2021-10-13 13:36:38 +00:00
TreeHugger Robot
3e4479c382 [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: b8f14a7db5 -s ours am: 3df34b9f6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iafbd0bf180c2b6f1576c804f765621249740b6c1
 2021-10-13 13:36:23 +00:00
Janis Danisevskis
8a0a38ebf1 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6833bbcb302ff7d9488a041aa019b401f7adf670
 2021-10-13 13:36:22 +00:00
TreeHugger Robot
6e4e897c77 [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours am: 80dc50df37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd4e75945bbabe48c8e0d00c8cd515ad482bc480
 2021-10-13 13:35:56 +00:00
Janis Danisevskis
102e8bf3b5 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: 9c6bc472e1 -s ours am: 65cf394942 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieff39fcb62dc446db4a2d2003ec8d8e3ae799beb
 2021-10-13 13:35:55 +00:00
TreeHugger Robot
dfaeda5039 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ecb92e8968 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12a0f5e9bcc6819164b54587e393799a78000713
 2021-10-13 13:35:34 +00:00
TreeHugger Robot
754b7df9f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14a18a67d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26ea00ef8c7e833f9cef642e6210ec061c551823
 2021-10-13 13:35:04 +00:00
Bill Yi
a656f263d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b6edf1163 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba5dde89485bef778065a5033f4a5a091f7682be
 2021-10-13 13:34:58 +00:00
Jeff DeCew
78c144418b [automerger skipped] Merge "Do not show the notification footer until the user is set up." into qt-dev am: 3bc24e3826 am: 025a668cf9 -s ours am: 525f35a68a -s ours am: 6bda916b61 -s ours am: 1479a93e45 -s ours 
am skip reason: Merged-In I49e2b8bcec7b2ce0a9776ff30a64c07f24949da7 with SHA-1 73c3c0a7d6 is already in history

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

Change-Id: Idfa099be39a07102f20d630e6b9efc8ccb7ab235
 2021-10-13 13:34:54 +00:00
Jeff DeCew
e4817eab60 [automerger skipped] Merge "Do not show the notification footer until the user is set up." into qt-dev am: 3bc24e3826 am: 025a668cf9 -s ours am: 525f35a68a -s ours am: 5e6690becb -s ours am: 6a0aca5d14 -s ours 
am skip reason: Merged-In I49e2b8bcec7b2ce0a9776ff30a64c07f24949da7 with SHA-1 73c3c0a7d6 is already in history

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

Change-Id: If91fe78438b80856fbc9225cf088a50c34f91c07
 2021-10-13 13:34:33 +00:00
Josh Tsuji
a323fb50fd Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-dev am: 1b7cf6d9a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15974634

Change-Id: Ib34e0e18d4755abcfb58b02b414972a5ac5e7bf0
 2021-10-13 13:32:16 +00:00