Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652,720 Commits 3 Branches 0 Tags
057c99e2e785676501cda9b05a64e1df3ede9543
Commit Graph

652720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Neal
057c99e2e7 Merge "Update CZ premium SMS codes" am: fef805fb72 am: 22572224ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772567

Change-Id: I339ed3b8c99bedb0e2545dad262eb56deca2fad7
 2021-08-04 11:03:16 +00:00
Richard Neal
22572224ff Merge "Update CZ premium SMS codes" am: fef805fb72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772567

Change-Id: I03a3658e99ea6e652e2014c43920bab0371fd1b1
 2021-08-04 10:48:59 +00:00
Richard Neal
fef805fb72 Merge "Update CZ premium SMS codes" 2021-08-04 10:33:25 +00:00
Xin Li
26c8b0b7d9 [automerger skipped] Merge "Rename T to Tiramisu" am: 318e6456f4 -s ours am: 1b30d0efdf -s ours 
am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 b7d18c309c is already in history

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

Change-Id: I1dd475a7196b83d50683a4f333620ce289af5ea0
 2021-08-04 08:57:06 +00:00
Xin Li
1b30d0efdf [automerger skipped] Merge "Rename T to Tiramisu" am: 318e6456f4 -s ours 
am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 b7d18c309c is already in history

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

Change-Id: I2343bcb5a4be4110eac9c4f01345c6868fc4908b
 2021-08-04 08:45:44 +00:00
Colin Cross
7ab52b0dd9 [automerger skipped] Rename T to Tiramisu am: b7d18c309c -s ours 
am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 ff02f9a70e is already in history

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

Change-Id: I4365c0f52c1e6673f58d72d2673140dc15ef5d7f
 2021-08-04 08:31:19 +00:00
Xin Li
318e6456f4 Merge "Rename T to Tiramisu" 2021-08-04 08:27:34 +00:00
Colin Cross
b7d18c309c Rename T to Tiramisu 
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Change-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c
Merged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c
 2021-08-04 06:53:36 +00:00
Xin Li
0e30e07dd8 [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 2f273c575b -s ours 
am skip reason: Merged-In Ibcfeef30c8cb88e244561cac99c034981b84ed80 with SHA-1 6fd185eedb is already in history

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

Change-Id: I7914d9f7f08692a7052f8181d99e423bdb1516de
 2021-08-04 06:23:18 +00:00
Riddle Hsu
c3b9b6ba95 Fix NPE when calling recreate in onCreate am: 6c675a3a48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15435289

Change-Id: I22adc2f4d43f4cf9331c677667c414b8f6a127eb
 2021-08-04 05:37:56 +00:00
Xin Li
2f273c575b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ibcfeef30c8cb88e244561cac99c034981b84ed80
Change-Id: I0dee74b1878f1baac52794efc6036a732240f8f3
 2021-08-03 21:49:30 -07:00
Kevin Chyn
d8205cdead Merge "Update error haptics for coex" into sc-dev am: 15fd1a115c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15456591

Change-Id: I103ef9ada205bcabb3e51cccb7e35969aa8842a8
 2021-08-04 02:26:59 +00:00
Riddle Hsu
6c675a3a48 Fix NPE when calling recreate in onCreate 
ActivityClientRecord#activity is assigned after calling
Activity#onCreate. A use case is that the app uses
support library to set night mode in onCreate.

Bug: 195418295
Test: Invoke Activity#recreate() in Activity#onCreate.
Change-Id: I6319cd6ee94fc2603979da47303963d04168db04
 2021-08-04 10:16:41 +08:00
Kevin Chyn
15fd1a115c Merge "Update error haptics for coex" into sc-dev 2021-08-04 02:13:03 +00:00
Treehugger Robot
f7e9d2f1ef [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a9042d5af5 -s ours am: e335645146 -s ours 
am skip reason: Merged-In Ibcfeef30c8cb88e244561cac99c034981b84ed80 with SHA-1 6fd185eedb is already in history

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

Change-Id: I8006692a617ea98f50786bf6737390ee2ce24032
 2021-08-04 01:59:47 +00:00
Treehugger Robot
e335645146 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a9042d5af5 -s ours 
am skip reason: Merged-In Ibcfeef30c8cb88e244561cac99c034981b84ed80 with SHA-1 6fd185eedb is already in history

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

Change-Id: I8784cead682fca14a2b18d302deeb91efdfed8b3
 2021-08-04 01:28:24 +00:00
Treehugger Robot
a9042d5af5 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Emilian Peev
08180f6251 Merge "Camera: Don't override extension surface native format" into sc-dev am: 4b68ed1fe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15456451

Change-Id: Ia0d2943e429632399faef3b485aaa95eff97ef54
 2021-08-04 01:02:39 +00:00
Emilian Peev
4b68ed1fe0 Merge "Camera: Don't override extension surface native format" into sc-dev 2021-08-04 00:50:17 +00:00
Yifan Hong
f203c1cd56 Merge "PairDevice to structured Parcelable." am: 7f2ce931d0 am: 214215dd0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780473

Change-Id: I41c9ef906f180daf2462921e3eb34b631db34786
 2021-08-04 00:07:38 +00:00
Yifan Hong
214215dd0f Merge "PairDevice to structured Parcelable." am: 7f2ce931d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780473

Change-Id: I9e7a276700dcbd288984458f32499edec67a8664
 2021-08-03 23:46:26 +00:00
Yifan Hong
7f2ce931d0 Merge "PairDevice to structured Parcelable." 2021-08-03 23:32:27 +00:00
Xin Li
300c70d676 DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ibcfeef30c8cb88e244561cac99c034981b84ed80
Change-Id: I0dee74b1878f1baac52794efc6036a732240f8f3
 2021-08-03 16:06:55 -07:00
Kevin Chyn
9fb4c3090b Update error haptics for coex 
Fixes: 193089985
Test: atest com.android.server.biometrics

Change-Id: I9daecabd1b5609261584146dd3ecb8f175312813
 2021-08-03 15:57:34 -07:00
Lee Shombert
36a936e58a Merge "PackageSetting now owns its PackageUserState" into sc-dev am: edb6d7f8a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363235

Change-Id: Id388edd1555ed66b7bcdd937e78f5768381a211b
 2021-08-03 22:19:05 +00:00
Lee Shombert
edb6d7f8a8 Merge "PackageSetting now owns its PackageUserState" into sc-dev 2021-08-03 22:02:55 +00:00
Yifan Hong
882a6e20b6 PairDevice to structured Parcelable. 
Bug: 194829333
Test: pass
Change-Id: I0b44555403113a7f68c865b33b87a85a6847cf21
 2021-08-03 14:17:03 -07:00
Makoto Onuki
f3ca2efa3a Merge "Make FGS_BG_START_RESTRICTION_CHANGE_ID @Overridable" into sc-dev am: 389475e436 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15436587

Change-Id: I96ae72d2bb80dc2f63d86a7ad7f66baf6fe433a6
 2021-08-03 21:10:55 +00:00
Makoto Onuki
389475e436 Merge "Make FGS_BG_START_RESTRICTION_CHANGE_ID @Overridable" into sc-dev 2021-08-03 21:00:59 +00:00
Emilian Peev
a72b3e92e9 Camera: Don't override extension surface native format 
Avoid overriding the native extension surface format when
retrieving the surface parameters.
The native surface format can later be used to configure
the device extension so the original value must be known.

Bug: 195366395
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I52d091fd782dc9ca2af60ba42ec1c5bbe080c1ca
 2021-08-03 13:13:03 -07:00
Nate Myren
9d1a9399b8 Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15446590

Change-Id: I42bdf188ec74c9d3a7179f717a08c7fec7f33833
 2021-08-03 20:06:34 +00:00
Nate Myren
5d97f29218 Merge "Add attribution info to start callbacks" into sc-dev 2021-08-03 19:56:02 +00:00
Kevin Chyn
de3244d3f0 Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472

Change-Id: I3dea7b6ede7f42911a3c89b4152da829985bfaf7
 2021-08-03 18:37:01 +00:00
Kevin Chyn
a0df5a941b Merge "Ensure authentication lifecycle ends for callers" into sc-dev 2021-08-03 18:28:26 +00:00
Nate Myren
f685a342c8 Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412

Change-Id: I362a049cc0e3a255796dc3481cbb153c734da76d
 2021-08-03 15:33:04 +00:00
Nate Myren
06d07d54db Add attribution info to start callbacks 
Add attribution flags and chain IDs to start callbacks, and have the
PermissionUsageHelper listen for starts. This ensures that, if another
start happens while an op is already running, and has chain information,
then this chain information will be recorded.

Test: manual
Bug: 194198234
Change-Id: I0ab1aa0969b70e18001f4a814ea5689f9329a019
 2021-08-03 08:25:31 -07:00
Nate Myren
50ff5ac8b8 Merge "Revert sync app op chain changes" into sc-dev 2021-08-03 15:16:35 +00:00
Jeff DeCew
052e6636a5 Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910

Change-Id: I4adb89b89bba2fe0d5d238b87849b9f0205b2bdd
 2021-08-03 13:39:48 +00:00
Jeff DeCew
2458c8f8c6 Merge "Fix hidden EmptyShadeView" into sc-dev 2021-08-03 13:28:10 +00:00
Joanne Chung
b6f5b2d050 Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896

Change-Id: I774dc6b5c4ad0a5994ae7407f059617732f17193
 2021-08-03 13:10:31 +00:00
Joanne Chung
6791ed0112 Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev 2021-08-03 12:45:43 +00:00
Ming-Shin Lu
cd80616cfc Merge "Fix Stay on 'SELECT INPUT METHOD' page after choosing input method" into sc-dev am: 0077be7bfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424959

Change-Id: Ifa9bdb8718da7356551ac867aa5b4f6df267e26d
 2021-08-03 10:18:30 +00:00
Ming-Shin Lu
0077be7bfa Merge "Fix Stay on 'SELECT INPUT METHOD' page after choosing input method" into sc-dev 2021-08-03 10:05:30 +00:00
Joanne Chung
223060d6f4 Bug fix: fix System crash due to NullPointerException. 
If the voice interaction doesn't set RecognitionService, it may cause
NPE when it tries to get recognizer name. We don't need recognizer
name since Android 12, we delete it directly. To avoid the app does
not set RecognitionService then updating the app to earlier platform
that may cause boot loop. We add a warning log and set empty service
for voiceinteraction to let app aware the problem. Also logging and
unset the voiceinteraction service if the app try to update the app
without recognition service.

Bug: 170742278
Test: Use sample VoiceInteractionService without a RecognitionService
The system doesn't crash when choosing the sample app as the default
assistant app from Settings. And make sure the VoiceInteractionService
is unset.
Test: Install sample VoiceInteractionService with a RecognitionService
and then update it without a RecognitionService. Make sure the voice
interaction service is unset.

Change-Id: I79ab3d6449984ead0be28a94adaad57ab24d1fb9
 2021-08-03 07:34:05 +00:00
Bill Lin
4032a44f10 Merge "Fix Multi user avater View overlap privacy dot" into sc-dev am: a017823717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15426438

Change-Id: I999c891fd53bfa72eaddfa44e87d86ebeb994bf6
 2021-08-03 07:24:04 +00:00
Bill Lin
a017823717 Merge "Fix Multi user avater View overlap privacy dot" into sc-dev 2021-08-03 07:07:31 +00:00
Bill Yi
3de6a3d2a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f10e214d5 -s ours am: 3dde81de83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I522a0be1683eac18066db63d8b36a1774a011f86
 2021-08-03 05:43:08 +00:00
Bill Yi
3dde81de83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f10e214d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc5e2d53b0cfa1df62b3c139ec0e70676bdd84ea
 2021-08-03 05:37:19 +00:00
Bill Yi
6d87f71583 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bf6a0e06c -s ours am: 8bc7d250c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I907454a69c25befa2faac8987b75b2c89d114a5d
 2021-08-03 05:32:46 +00:00
Bill Yi
8bc7d250c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bf6a0e06c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa0fc0971f4715971a28e77f5de2f0389cf68b9f
 2021-08-03 05:29:25 +00:00