Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
759,872 Commits 3 Branches 0 Tags
52f0b95bf911f4eca7927724ea6c0fdcf3bbe032
Commit Graph

759872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
52f0b95bf9 Merge changes from topic "presubmit-am-f6a40d8445d84e998849e35ec877030d" into tm-mainline-prod 
* changes:
  [automerge] [Media UMO] Show times when scrubbing. 2p: f9942f0ad8
  [Media UMO] Show times when scrubbing.
 2022-04-07 19:36:16 +00:00
Atneya Nair
2f127bbb27 Merge changes from topic "presubmit-am-854e87546f4d480bac0403b988c53fe4" into tm-mainline-prod 
* changes:
  [automerge] Move common JNI code out of AudioTrack 2p: 26845c3dfd
  Move common JNI code out of AudioTrack
 2022-04-07 19:25:09 +00:00
TreeHugger Robot
2ab3b9818f Merge changes from topic "presubmit-am-c0a85a4281464732aaab0204b1f5d2be" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 18f15059ff
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 19:20:45 +00:00
Steve Elliott
a7f5bd4903 Merge changes from topic "presubmit-am-5afc0bf9bc1d45e795f2a48bfafc5aea" into tm-mainline-prod 
* changes:
  [automerge] Prune summaries if only group children filtered 2p: be918ae7ee
  Prune summaries if only group children filtered
 2022-04-07 19:10:44 +00:00
Jason Chang
57586be42e Merge "Fix One-handed mode tutorial broken on large screen device" into tm-dev am: 118e6bacdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411125

Change-Id: I1565bb2461d0f26ca5e0bf7c2416f00b0e4208bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:19:16 +00:00
TreeHugger Robot
523c8cade8 Merge "Align footer actions with notif background" into tm-dev am: aa1b95a346 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587424

Change-Id: I2ab751e2d998d3014c2002127591c93fae0e1c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:17:42 +00:00
Jason Chang
118e6bacdb Merge "Fix One-handed mode tutorial broken on large screen device" into tm-dev 2022-04-07 18:10:11 +00:00
TreeHugger Robot
60c017c0cd Merge changes from topic "presubmit-am-7d1edc1968704afeabb7ff97c06306f4" into tm-mainline-prod 
* changes:
  [automerge] Align footer actions with notif background 2p: 0b0f698762
  Align footer actions with notif background
 2022-04-07 18:09:07 +00:00
TreeHugger Robot
aa1b95a346 Merge "Align footer actions with notif background" into tm-dev 2022-04-07 18:09:07 +00:00
TreeHugger Robot
3ebdc250e2 Merge "Use single line header in landscape handheld" into tm-dev am: a6713ec97e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607579

Change-Id: I3c18b006839d2026ce5dc70c7299a3fb1459bd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:02:49 +00:00
Jing Ji
036dd804b1 Merge "Update the PendingIntent to launch Settings on bg restriction alert" into tm-dev am: b0d14a0ee5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17606183

Change-Id: I2e51249a2f2d28cf119c7a103ccdfbd772f470f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:02:29 +00:00
TreeHugger Robot
a6713ec97e Merge "Use single line header in landscape handheld" into tm-dev 2022-04-07 17:56:40 +00:00
TreeHugger Robot
ca133319d6 Merge changes from topic "presubmit-am-4422f41113a3447c8dda8766b9563550" into tm-mainline-prod 
* changes:
  [automerge] Use single line header in landscape handheld 2p: 380bc2b2cd
  Use single line header in landscape handheld
 2022-04-07 17:56:40 +00:00
Jing Ji
b0d14a0ee5 Merge "Update the PendingIntent to launch Settings on bg restriction alert" into tm-dev 2022-04-07 17:56:36 +00:00
Jing Ji
d6bcf4e05f Merge changes from topic "presubmit-am-bd01718025d3469587dc5fe9b7b57165" into tm-mainline-prod 
* changes:
  [automerge] Update the PendingIntent to launch Settings on bg restriction alert 2p: 8abd49be00
  Update the PendingIntent to launch Settings on bg restriction alert
 2022-04-07 17:56:36 +00:00
Aaron Liu
d5d7d58282 Merge "[Fix settings] Multi user for settings wrapper" into tm-dev am: f2acd2040e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592725

Change-Id: Ia83b80ba9458c69f11785ff88a7ee2a2c35cdaaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:54:36 +00:00
Aaron Liu
f2acd2040e Merge "[Fix settings] Multi user for settings wrapper" into tm-dev 2022-04-07 17:46:26 +00:00
Aaron Liu
28a6327fb8 Merge changes from topic "presubmit-am-6c9d45f3c448459988f5ee40b416e0db" into tm-mainline-prod 
* changes:
  [automerge] [Fix settings] Multi user for settings wrapper 2p: e28baefa31
  [Fix settings] Multi user for settings wrapper
 2022-04-07 17:46:26 +00:00
TreeHugger Robot
edcfcb05ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3ca83af4e6 -s ours am: d78c757088 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5abff8e3e6f02fef30c8a2f6cb93c4fb9e04a011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:30:28 +00:00
Bill Yi
fc28d6a5ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33a2dc0759 -s ours am: bb1400f046 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdae56a165d05c024d17cfd6e92b5c5173f30f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:30:27 +00:00
TreeHugger Robot
53e6ad965d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8f23622068 -s ours am: f9a5e6183d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I547417b65e6943094c8f9c232207b7d032b5a524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:30:12 +00:00
TreeHugger Robot
d78c757088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3ca83af4e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869b58e9b21c84e65da65c64d225f207f364cfab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:26:27 +00:00
Bill Yi
bb1400f046 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33a2dc0759 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebed3378f51a2e25eb0b0dd44061e43fa14e8ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:26:11 +00:00
TreeHugger Robot
f9a5e6183d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8f23622068 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96e20619bc0438a0defcdac307276cf860e7a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:29 +00:00
TreeHugger Robot
776e4d2df1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b727ae21be -s ours am: 2dbaec6a9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf1dfc9e499779b2663d76990e8e4b4c0d44b5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:20 +00:00
Automerger Merge Worker
0d791afec3 [automerger skipped] Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 am: a5d599f7b6 -s ours am: f3bb0302a2 -s ours 
am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8ff is already in history

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

Change-Id: I1d2c08877e24251f9e867d1c12e35249567f9854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:07 +00:00
TreeHugger Robot
90976d30b9 [automerger skipped] Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am: 196fc30c20 am: 466149ed70 -s ours am: 7e82159774 -s ours 
am skip reason: Merged-In I57c57cbb156dae79fa46e917285330f07ff7edce with SHA-1 432e035300 is already in history

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

Change-Id: I09fbe13d74cf879aa0c1a715f89d4ca6536f033c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:55 +00:00
TreeHugger Robot
d36f0a139f Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into tm-dev am: bf850d65a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17623221

Change-Id: Ib88ff0b301644697ff9b542084cde148bf332856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:40 +00:00
Bill Yi
86eea31ff4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6b561ac844 am: cc3bc89fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic49bcfbb6bab36ab2d79f32aa01ac58bc13b959f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:37 +00:00
TreeHugger Robot
2dbaec6a9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b727ae21be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6e6e2217900edfc72652f5cd4d4db154f5ebfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:12 +00:00
TreeHugger Robot
eb300a314f Merge changes from topic "presubmit-am-5d0b5ec753a44b1cb74d9f24a3e843e8" into tm-dev am: 1b593cabb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17625142

Change-Id: I2fa5384d100ce25e3fe0f83ae9cb2be280ecaf61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:23:42 +00:00
Bill Yi
d77a3c3bf1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 778b3f9176 am: f686904be8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide54c93be1a5fbc813685841c852780d761a0519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:23:40 +00:00
Automerger Merge Worker
f3bb0302a2 [automerger skipped] Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 am: a5d599f7b6 -s ours 
am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8ff is already in history

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

Change-Id: I3440da84492a66ce18b9dce52340374a3effb5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:09:07 +00:00
TreeHugger Robot
7e82159774 [automerger skipped] Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am: 196fc30c20 am: 466149ed70 -s ours 
am skip reason: Merged-In I57c57cbb156dae79fa46e917285330f07ff7edce with SHA-1 432e035300 is already in history

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

Change-Id: Ie3c51425c24b2f96a1fd65799296c95885e8fa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:08:28 +00:00
TreeHugger Robot
3ca83af4e6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:00:19 +00:00
TreeHugger Robot
8f23622068 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 16:59:15 +00:00
TreeHugger Robot
bf850d65a8 Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6b561ac844
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 16:59:15 +00:00
TreeHugger Robot
b727ae21be Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 16:59:11 +00:00
TreeHugger Robot
1b593cabb1 Merge changes from topic "presubmit-am-5d0b5ec753a44b1cb74d9f24a3e843e8" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 778b3f9176
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 16:59:11 +00:00
Automerger Merge Worker
a5d599f7b6 Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:48:36 +00:00
Chavi Weingarten
e46910cc9b Merge "Update IME SECURE flag if Window updates SECURE flag" into tm-dev am: 0e11b2c738 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17590912

Change-Id: I976c0974ae8cf7c33892f6f19a2847a7fcf4922a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:48:23 +00:00
Hui Yu
cdc187e224 Merge "Null check on BroadcastRecord's receivers list." into tm-dev am: f3e8d88277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17590974

Change-Id: Icfca320b48701d6cf8f76deaaa76dd828b6722bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:47:54 +00:00
Remi NGUYEN VAN
e343f61ff1 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: 1ee4525e72 am: b597282629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ia175b8352418e34612270f342200488ae845ad60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:47:23 +00:00
TreeHugger Robot
466149ed70 Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am: 196fc30c20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17529131

Change-Id: I8e1e077644160f89e7ad1b9ad553e7cf62de20b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:47:10 +00:00
Chavi Weingarten
0e11b2c738 Merge "Update IME SECURE flag if Window updates SECURE flag" into tm-dev 2022-04-07 16:44:54 +00:00
Chavi Weingarten
456d0a7ea1 Merge changes from topic "presubmit-am-d3edc2b63dca42ef83af1bcef3b4550a" into tm-mainline-prod 
* changes:
  [automerge] Update IME SECURE flag if Window updates SECURE flag 2p: 90d0e50b6f
  Update IME SECURE flag if Window updates SECURE flag
 2022-04-07 16:44:54 +00:00
Hui Yu
f3e8d88277 Merge "Null check on BroadcastRecord's receivers list." into tm-dev 2022-04-07 16:34:16 +00:00
Hui Yu
8614c6e201 Merge changes from topic "presubmit-am-28eaceeb106d4ecb9a115fcdbff92b92" into tm-mainline-prod 
* changes:
  [automerge] Null check on BroadcastRecord's receivers list. 2p: fc32f968d6
  Null check on BroadcastRecord's receivers list.
 2022-04-07 16:34:15 +00:00
Automerger Merge Worker
a18c3121d7 Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev 2022-04-07 16:33:17 +00:00
TreeHugger Robot
196fc30c20 Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev 2022-04-07 16:33:08 +00:00