Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
444,119 Commits 3 Branches 0 Tags
2593e104d5cf829b2aa7a715530bebd63b3dc991
Commit Graph

444119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
2593e104d5 Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510" into qt-qpr1-dev-plus-aosp 2020-02-11 23:25:09 +00:00
Automerger Merge Worker
03cebe3202 Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev am: c1e78426b5 
Change-Id: Ia7277711125ed3be7cf9914483601488f66e94ca
 2020-02-11 23:24:38 +00:00
Automerger Merge Worker
2f29a7c93b Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510 
Change-Id: I3b65daf966f8707e24598d9ded93d2e755acf907
 2020-02-11 23:24:32 +00:00
TreeHugger Robot
c1e78426b5 Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev 2020-02-11 23:20:29 +00:00
Automerger Merge Worker
88fffb6ad6 Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev am: 6ac8c0d096 
Change-Id: I6fedf6dd00d79b9aeb7b48b91535fe44a936673b
 2020-02-11 23:05:08 +00:00
Automerger Merge Worker
fcc25eb58f Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 
Change-Id: I1dc39baa8e353cf414cf6c591cd0ac3245b7cea2
 2020-02-11 23:04:08 +00:00
Automerger Merge Worker
88904f9cf3 DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 
Change-Id: If7965603748b09b8ea34528bf7c1bbf78986611f
 2020-02-11 23:03:55 +00:00
Automerger Merge Worker
f1e6950510 Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee 
Change-Id: I225b599e1bb7ba052361c0c0cb926b2c015f7baf
 2020-02-11 23:03:21 +00:00
TreeHugger Robot
6ac8c0d096 Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev 2020-02-11 23:02:07 +00:00
Steven Moreland
35d04c27ee Merge "Remove String16 operator<<, now provided in header" 2020-02-11 22:43:26 +00:00
TreeHugger Robot
bace1cd5a4 Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev 2020-02-11 22:39:07 +00:00
Automerger Merge Worker
30afdb5300 Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341 am: 285f6781c1 
Change-Id: I118e59b1d9d3448ecb7e5bccffb3045c7828f45f
 2020-02-11 22:32:10 +00:00
Automerger Merge Worker
285f6781c1 Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341 
Change-Id: I8f0d55f7a310e6dff8cf552e5ddf929eb8d0c2b7
 2020-02-11 22:14:58 +00:00
Treehugger Robot
668daf0341 Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" 2020-02-11 21:55:09 +00:00
Automerger Merge Worker
f0b9f042de Merge "Add HomeVisibilityObserver APIs in ActivityManager." am: cb47d86158 am: c1363ad2b9 
Change-Id: If7b65fd40532a8868463a5d545da5c197676ffe8
 2020-02-11 21:34:57 +00:00
Automerger Merge Worker
8193829601 Merge changes I7099048c,If6965979 am: fd46f62892 am: e92242378e 
Change-Id: Ifc9d0c5bda88dc0107427c09183f6c0e259c6b83
 2020-02-11 21:34:41 +00:00
Automerger Merge Worker
0d7c07c7b6 Make Telephony to Setting notification @SystemApi am: 7c5e823965 am: 6078c8641f 
Change-Id: Ic9b5187561b51565877977450a157364689a6069
 2020-02-11 21:34:37 +00:00
Automerger Merge Worker
f68b28e3e4 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: e53f6ddd8f -s ours am: fd90ba695c -s ours 
am skip reason: subject contains skip directive

Change-Id: I16c06c6e1abed25d121133ec8ec0a8f2411c2a84
 2020-02-11 21:34:12 +00:00
Automerger Merge Worker
c1363ad2b9 Merge "Add HomeVisibilityObserver APIs in ActivityManager." am: cb47d86158 
Change-Id: Ib48d687e8da2941fa3385aa5066e4d490b1d3ad8
 2020-02-11 21:10:48 +00:00
Automerger Merge Worker
e92242378e Merge changes I7099048c,If6965979 am: fd46f62892 
Change-Id: Ida71dbbdc2d608d551e5e05483f5beea3a294f65
 2020-02-11 21:09:50 +00:00
Automerger Merge Worker
6078c8641f Make Telephony to Setting notification @SystemApi am: 7c5e823965 
Change-Id: Ia88cfa333168b383a2b894165bf7ab8dcdd99021
 2020-02-11 21:09:42 +00:00
Automerger Merge Worker
fd90ba695c [automerger skipped] Merge "Import translations. DO NOT MERGE" am: e53f6ddd8f -s ours 
am skip reason: subject contains skip directive

Change-Id: I20294970eb9af377071fbd042f6f0e84c1faac16
 2020-02-11 21:08:20 +00:00
Automerger Merge Worker
4cbf21d607 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: f76575265c -s ours am: 14cb134570 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1f54c9666e7df2063783851d3b56c7e9b60385a9
 2020-02-11 21:01:56 +00:00
Xiangyu/Malcolm Chen
cb47d86158 Merge "Add HomeVisibilityObserver APIs in ActivityManager." 2020-02-11 21:00:16 +00:00
Xiangyu/Malcolm Chen
fd46f62892 Merge changes I7099048c,If6965979 
* changes:
  Expose RESULT_RECEIVER_CONTROLLER_KEY as @SystemApi.
  Make Telephony to Setting notification @SystemApi
 2020-02-11 20:59:52 +00:00
Treehugger Robot
e53f6ddd8f Merge "Import translations. DO NOT MERGE" 2020-02-11 20:48:29 +00:00
Automerger Merge Worker
14cb134570 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: f76575265c -s ours 
am skip reason: subject contains skip directive

Change-Id: I35198ddafef7486a730ba72f8c5ac3130dc8e6e3
 2020-02-11 20:38:25 +00:00
Automerger Merge Worker
2792895cd5 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1720a48cb3 -s ours am: 87a94d9556 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id6f66e21bd2829bfe3876b633ec9151c6f1d8063
 2020-02-11 20:24:50 +00:00
Automerger Merge Worker
2b0a36a65c [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 54580f8419 -s ours am: 7b6b19b4ab -s ours 
am skip reason: subject contains skip directive

Change-Id: I8254d071d71afcf1bb367b69f69efc5fd108b36c
 2020-02-11 20:24:38 +00:00
Treehugger Robot
f76575265c Merge "Import translations. DO NOT MERGE" 2020-02-11 20:23:49 +00:00
Automerger Merge Worker
87a94d9556 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1720a48cb3 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ef1c32abc938b857486beac90ac745c88cfdbee
 2020-02-11 20:15:24 +00:00
Automerger Merge Worker
7b6b19b4ab [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 54580f8419 -s ours 
am skip reason: subject contains skip directive

Change-Id: I519807554e1744033164ded9f871e8d0b00bfb93
 2020-02-11 20:15:07 +00:00
Treehugger Robot
1720a48cb3 Merge "Import translations. DO NOT MERGE" 2020-02-11 20:11:59 +00:00
Treehugger Robot
54580f8419 Merge "Import translations. DO NOT MERGE" 2020-02-11 20:03:20 +00:00
Automerger Merge Worker
79fe675703 Merge "Move the UCE APIs to @hide for Android R" am: c71b27c2d5 am: 7af40d3a38 
Change-Id: If64d9178632d9a27e63a99c47bdfe2be5f26ad36
 2020-02-11 17:51:54 +00:00
Robin Lee
9be54b5b67 Give CONTROL_DEVICE_LIGHTS permission to the shell 
Bug: 144979010
Bug: 144978691
Test: atest LightsManagerTest
Change-Id: I2924460c76ce4545c9c3dd3875456b936fe3fc69
Merged-In: I2b4224e79e013bae27ee068b0a0898b5afa5489a
 2020-02-11 17:46:40 +00:00
Automerger Merge Worker
7af40d3a38 Merge "Move the UCE APIs to @hide for Android R" am: c71b27c2d5 
Change-Id: I5280fa2744925812c17e7807a4e63a6874183706
 2020-02-11 17:37:32 +00:00
Brad Ebinger
c71b27c2d5 Merge "Move the UCE APIs to @hide for Android R" 2020-02-11 17:18:20 +00:00
Automerger Merge Worker
a939bb2f64 Merge "Use the main thread to update alignment indication" into qt-qpr1-dev am: 94431615b1 
Change-Id: Ibd86563b5d894e2d6623e17986cf13814fb0268a
 2020-02-11 03:58:52 +00:00
Wilson Wu
94431615b1 Merge "Use the main thread to update alignment indication" into qt-qpr1-dev 2020-02-11 03:54:55 +00:00
Automerger Merge Worker
cd9e71744e Merge changes from topic "am-90f3bc3d5bbe49498428b40defa6b5a1" into qt-qpr1-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2ab
  [DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING am: 4aced5d906
 2020-02-11 03:52:51 +00:00
Automerger Merge Worker
3c0cd40a23 Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2ab 
Change-Id: I3b96e9651e88d0b4f2e8f3162c51d75fb9433ac8
 2020-02-11 03:52:41 +00:00
Automerger Merge Worker
c13051d509 [DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING am: 4aced5d906 
Change-Id: I3e4bf38534fc2192f266acf1038d77e774e24a53
 2020-02-11 03:52:30 +00:00
Automerger Merge Worker
45d4d19fc5 [automerger skipped] Merge "Fix review comments on aosp/1213524" am: a77fbc2539 -s ours am: 70158f3240 -s ours 
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 2dda9e0627 is in history

Change-Id: I6a138aa326a628fca7eda309f5627dd47a0ca56e
 2020-02-11 03:52:28 +00:00
Automerger Merge Worker
70158f3240 [automerger skipped] Merge "Fix review comments on aosp/1213524" am: a77fbc2539 -s ours 
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 2dda9e0627 is in history

Change-Id: I1016fc76028aeafa9f15841b4e2951957aa11578
 2020-02-11 03:43:38 +00:00
TreeHugger Robot
3bc45ce2ab Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev 2020-02-11 03:43:31 +00:00
Aaron Huang
a77fbc2539 Merge "Fix review comments on aosp/1213524" 2020-02-11 03:33:08 +00:00
Automerger Merge Worker
6dbd32d54f Merge "Dump prereboot information before device reboot" am: 61981ca7be am: 4c41bd0988 
Change-Id: Icda9436bc956241b5197e982c9b13b3085c906c8
 2020-02-11 03:17:41 +00:00
Automerger Merge Worker
4c41bd0988 Merge "Dump prereboot information before device reboot" am: 61981ca7be 
Change-Id: I37ca76d0a5183cf099894d7e8ac7c94b13906688
 2020-02-11 03:08:55 +00:00
Jerry Chang
61981ca7be Merge "Dump prereboot information before device reboot" 2020-02-11 02:49:29 +00:00