Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
3f99ca4f24 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours" into rvc-d1-dev-plus-aosp 2020-07-19 15:16:18 +00:00
TreeHugger Robot
361164f977 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: b94d0f3187 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1221f43229d5d63267426d3862870d65b92d5f8f
 2020-07-19 15:16:07 +00:00
TreeHugger Robot
cdf6d64f0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9798482cc45f703e4a4fd9e79373ffe31216c844
 2020-07-19 15:16:01 +00:00
TreeHugger Robot
670bdd3b74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 94ef8f65e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied3dc57be5bc6291c9edff1adcc4bfad273a0611
 2020-07-19 15:16:00 +00:00
TreeHugger Robot
a1f3c2d016 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie67bcc2b4c4fd2a10ec0a7d48602b6ab9d037c71
 2020-07-19 15:00:11 +00:00
TreeHugger Robot
b94d0f3187 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab9f45716891250b329eb96b087e41764f70fe85
 2020-07-19 15:00:08 +00:00
TreeHugger Robot
75f9d330db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdccbdab3637dec88feec5aef72c2e0bd38de733
 2020-07-19 14:59:56 +00:00
TreeHugger Robot
94ef8f65e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic037154659ce6e23d2333d8d2837e14293e1c605
 2020-07-19 14:59:55 +00:00
TreeHugger Robot
d3f766ee0f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-19 14:52:06 +00:00
TreeHugger Robot
f6d4adeef4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-19 14:48:47 +00:00
Bill Yi
4483224a7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6925f9b46eea739365ccaa263e64d977e6aa9b25
 2020-07-19 00:05:22 -07:00
Bill Yi
8c4c530422 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18c501af0e75d2afd6b857b02a93e03dfc9bab56
 2020-07-18 23:37:31 -07:00
Bill Yi
37a870f64b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8150894a31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I351ba7928b972dde5c9588851f8e96c7e4dda536
 2020-07-19 05:39:46 +00:00
Bill Yi
8150894a31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I910d6f01e5308177c1e2c238d540a70b75d92bc7
 2020-07-18 20:03:58 -07:00
android-build-team Robot
59fba3e446 Snap for 6691629 from 851960cdd1 to rvc-release 
Change-Id: Ibb40bf07606bef7a9e08ff28e8f17681aab0802d
 2020-07-18 23:15:59 +00:00
Colin Cross
3539f1e2d9 Merge changes from topic "b160781930-upgrade-dagger-rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: e179b819cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12182247

Change-Id: I6997b6cfefaa115c092d15734e37206b84f89c18
 2020-07-18 16:57:14 +00:00
Dave Mankoff
faebff9aea Remove duplicate binding of RowContentBindStage am: 5b01fcc846 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12182246

Change-Id: Ib5e8a2f65587ab033513c8bfdaabc005e5066ffb
 2020-07-18 16:57:04 +00:00
Colin Cross
e179b819cd Merge changes from topic "b160781930-upgrade-dagger-rvc-dev-plus-aosp" into rvc-dev-plus-aosp 
* changes:
  Update Dagger2 dependencies.
  Remove duplicate binding of RowContentBindStage
 2020-07-18 16:38:46 +00:00
TreeHugger Robot
a14e88120f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours am: a99806ee78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3929fa5f5e5e15fb4dc472a0987a2a48eba3ddb
 2020-07-18 07:29:33 +00:00
TreeHugger Robot
f308ec62f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours am: cb2bff1f62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc2090ea4bc8e099db7dddb622dc0608567bbb60
 2020-07-18 07:29:19 +00:00
TreeHugger Robot
a99806ee78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic399df0e16a319aefc81c7f85a5895176836a2bf
 2020-07-18 07:17:29 +00:00
TreeHugger Robot
cb2bff1f62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28ca4cdf5cd00753d9b609d90e628b05d156f615
 2020-07-18 07:17:28 +00:00
TreeHugger Robot
851960cdd1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 07:06:04 +00:00
Automerger Merge Worker
3e14f4892e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: e4a4b7dbee -s ours" into rvc-d1-dev-plus-aosp 2020-07-18 06:30:53 +00:00
Bill Yi
4de185f8b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: e4a4b7dbee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id667ddc47f7773edd71d714761c12c8d9089d659
 2020-07-18 06:30:41 +00:00
Bill Yi
3c4274e79b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: 8a673b874f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib58ed399e2ededb3bb22197b47d267a0b447da5f
 2020-07-18 06:30:26 +00:00
Bill Yi
e4a4b7dbee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I402547804c437deefd08816c149c0c699ff9d995
 2020-07-18 06:07:20 +00:00
Bill Yi
8a673b874f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8f473a8e4c9075d92c4ef90517c416aced87c0a
 2020-07-18 06:07:18 +00:00
Bill Yi
3f5dd27b0b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iec90fad5c9d26c9d2345a5f390f8a714b9bac815
 2020-07-17 21:18:53 -07:00
Treehugger Robot
027b1c501c [automerger skipped] Merge "Enable clang-format for frameworks/base" am: 8857e6b645 am: 3a3a21f9dc -s ours am: 7bd2860e73 -s ours 
am skip reason: Change-Id I08b8c6d1bae7d1954847c207ef8e6d80373b2d05 with SHA-1 a3117ca4c6 is in history

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

Change-Id: I96e96599bdba5ff218fcac51d5da63ec0c2bbe38
 2020-07-18 03:34:49 +00:00
Treehugger Robot
7bd2860e73 [automerger skipped] Merge "Enable clang-format for frameworks/base" am: 8857e6b645 am: 3a3a21f9dc -s ours 
am skip reason: Change-Id I08b8c6d1bae7d1954847c207ef8e6d80373b2d05 with SHA-1 a3117ca4c6 is in history

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

Change-Id: Id4c1132e05c004d72c3260d2e9d64616049a4419
 2020-07-18 03:18:09 +00:00
Treehugger Robot
3a3a21f9dc Merge "Enable clang-format for frameworks/base" am: 8857e6b645 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1366076

Change-Id: Ie2dab15b058d18f59ddc0cb882af8808c8d42bc2
 2020-07-18 02:48:25 +00:00
Bill Yi
72d3135ecb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia2cb81141a0d3530bb345c3e57b73fd04b7912cf
 2020-07-17 19:37:54 -07:00
Treehugger Robot
8857e6b645 Merge "Enable clang-format for frameworks/base" 2020-07-18 02:24:02 +00:00
Garfield Tan
4c2d3daf6a Enable clang-format for frameworks/base 
Copy and paste internal setup to AOSP. Not include folders not in AOSP
yet.

Bug: None
Test: repo upload
Change-Id: I08b8c6d1bae7d1954847c207ef8e6d80373b2d05
Merged-In: I08b8c6d1bae7d1954847c207ef8e6d80373b2d05
 2020-07-17 18:43:18 -07:00
android-build-team Robot
542385dda8 Snap for 6690197 from 3affbe4d9f to rvc-release 
Change-Id: Iff50afbc6d986908a3a16c7c79d1c8aa9a7af3ce
 2020-07-18 01:02:10 +00:00
Yu-Han Yang
2b313d61ae DO NOT MERGE: Remove unused intent in NiNotification 
Bug: 154319182
Test: manual
Change-Id: I5958a8fb442cf4506e1824243493f91aea34a7cc
Merged-In: I5958a8fb442cf4506e1824243493f91aea34a7cc
 2020-07-18 00:42:21 +00:00
John Reck
80a9cce44b Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:32:48 +00:00
John Reck
5e2931c656 Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
(cherry picked from commit 0354261197)
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:32:45 +00:00
John Reck
9c33b3fe91 Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:32:42 +00:00
John Reck
3a5cd5bbe3 Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
(cherry picked from commit 0354261197)
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:32:37 +00:00
John Reck
8f3de48e19 Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:32:20 +00:00
John Reck
bfdb7121ef Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
 2020-07-18 00:31:57 +00:00
Yu-Han Yang
dd9b2c4238 DO NOT MERGE: Remove unused intent in NiNotification 
Bug: 154319182
Test: manual
Change-Id: I5958a8fb442cf4506e1824243493f91aea34a7cc
Merged-In: I5958a8fb442cf4506e1824243493f91aea34a7cc
 2020-07-18 00:17:35 +00:00
Sudheer Shanka
dbb5495c64 Merge "Don't try to handle callbacks until mSystemReady is set." into rvc-dev am: 20f7d15884 am: e98160cd01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180378

Change-Id: I9c61fb8f9929859a2546af1d81c613c73c52d736
 2020-07-18 00:03:07 +00:00
Wale Ogunwale
fc68945868 Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d9f am: c3e5f8315a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180365

Change-Id: Ifab53511e328ccbdba848952fc2c0f3f8f3c5bfa
 2020-07-18 00:02:47 +00:00
Sudheer Shanka
c8b59d5442 Merge "Don't try to handle callbacks until mSystemReady is set." into rvc-dev am: 20f7d15884 am: ac37645240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180378

Change-Id: I82845b0ea501ce6e9189bad0faab197356bef4b4
 2020-07-18 00:02:03 +00:00
Wale Ogunwale
0e03068525 Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d9f am: 378737945e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180365

Change-Id: I9c7567c76d4e414087dcbb8e8c387f26e70ca8f6
 2020-07-18 00:01:56 +00:00
Automerger Merge Worker
c9a482fc01 Merge "Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5ad2 am: a56ba188c9" into rvc-d1-dev-plus-aosp 2020-07-18 00:01:41 +00:00
Wale Ogunwale
ba36f77961 Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5ad2 am: a56ba188c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166481

Change-Id: I74c2761696655e02c31283c287c7bb2e2d04ed2b
 2020-07-18 00:01:33 +00:00