Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370,682 Commits 3 Branches 0 Tags
a086da2cd0bd938142e461c8bb46e30fc3474882
Commit Graph

370682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
a086da2cd0 Merge "AAPT: Multiple period legacy support and errors" into pi-dev am: f845891031 
am: 68dc7ca568

Change-Id: I9da94ea0e84ff3caf28597b1038ed6e4ac158280
 2018-04-12 11:51:16 -07:00
jiabin
f8817064c1 Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev am: ccaba49ab5 
am: b2d12fb3e0

Change-Id: I618e5250bf4416fa1de34bad57677d25167ec6a7
 2018-04-12 11:45:35 -07:00
TreeHugger Robot
f25044f947 Merge "Import translations. DO NOT MERGE" 2018-04-12 18:40:28 +00:00
TreeHugger Robot
109b1006b9 Merge "Import translations. DO NOT MERGE" 2018-04-12 18:39:40 +00:00
TreeHugger Robot
b61b9d584b Merge "Import translations. DO NOT MERGE" 2018-04-12 18:32:48 +00:00
Ryan Mitchell
68dc7ca568 Merge "AAPT: Multiple period legacy support and errors" into pi-dev 
am: f845891031

Change-Id: Id1ac75606df1b8bf99281febf5c7266de6889457
 2018-04-12 10:39:00 -07:00
Julia Reynolds
79fdd41557 Merge "Pre P apps can't change new fields" into pi-dev am: c11cb1b151 
am: 7b9d3239ef

Change-Id: I2ee3fea6b53fbdfffb6a5ad022269e6ee5a58f2c
 2018-04-12 10:36:09 -07:00
Ryan Mitchell
f845891031 Merge "AAPT: Multiple period legacy support and errors" into pi-dev 2018-04-12 17:21:32 +00:00
jiabin
b2d12fb3e0 Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev 
am: ccaba49ab5

Change-Id: I06bae53d958898a61bea519cc5ee3a1dae4a7074
 2018-04-12 10:17:24 -07:00
TreeHugger Robot
ccaba49ab5 Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev 2018-04-12 17:05:12 +00:00
Julia Reynolds
7b9d3239ef Merge "Pre P apps can't change new fields" into pi-dev 
am: c11cb1b151

Change-Id: I9f09a5932de931dc8e7414f9dcd57b89a121d82c
 2018-04-12 09:56:43 -07:00
Stanley Tng
69b3cd01e2 Merge "Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" am: 0980006a2a am: cb3222d662" into pi-dev-plus-aosp 
am: e10415dfe4

Change-Id: Ic728f2e7563dae028c483567adffd60fcdb1d388
 2018-04-12 09:53:44 -07:00
TreeHugger Robot
c11cb1b151 Merge "Pre P apps can't change new fields" into pi-dev 2018-04-12 16:40:37 +00:00
Jason Monk
d262efebef Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev am: d532ff3397 
am: 3f25e5504d

Change-Id: I0485fe6cbfc6cf5e3d813ad71f181abb3bdb1637
 2018-04-12 09:35:45 -07:00
Tony Mak
1431b86cac Merge "Check in the new work profile icon" into pi-dev am: be0f2a49e2 
am: cbf2080d7b

Change-Id: I0afdc1c1a31690ec0f7827fdc8e4115516c16a11
 2018-04-12 09:30:19 -07:00
Android Build Merger (Role)
e10415dfe4 Merge "Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" am: 0980006a2a am: cb3222d662" into pi-dev-plus-aosp 2018-04-12 16:25:27 +00:00
Jason Monk
3f25e5504d Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev 
am: d532ff3397

Change-Id: I8287fec3a1cc321b1c1a27046b03354725dcd2b9
 2018-04-12 09:24:54 -07:00
Joel Galenson
b7fe2bab9d Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev am: 52ae06af4d 
am: ecb54b0d3d

Change-Id: I92b974e54bbb51d47339c67513c8654e84dfd35f
 2018-04-12 09:20:29 -07:00
Tony Mak
cbf2080d7b Merge "Check in the new work profile icon" into pi-dev 
am: be0f2a49e2

Change-Id: I1a2783915700cc938a850ae4283c64e29c97e329
 2018-04-12 09:19:58 -07:00
Stanley Tng
a24d56eccf Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" am: 0980006a2a 
am: cb3222d662

Change-Id: I3ce8fd7d371050546e4b5434af351469d5c12309
 2018-04-12 09:10:47 -07:00
Joel Galenson
ecb54b0d3d Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev 
am: 52ae06af4d

Change-Id: Ifa75e67c23797b2578cc1e5dfea989a1df953667
 2018-04-12 09:10:31 -07:00
Rohan Shah
29a955a440 Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev am: 3dee3d19c2 
am: c480082eff

Change-Id: I490f3ef807ae92c65a25560c8657e6b7ef35cadc
 2018-04-12 09:09:34 -07:00
TreeHugger Robot
d532ff3397 Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev 2018-04-12 16:06:36 +00:00
TreeHugger Robot
be0f2a49e2 Merge "Check in the new work profile icon" into pi-dev 2018-04-12 16:02:07 +00:00
Rohan Shah
c480082eff Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev 
am: 3dee3d19c2

Change-Id: I53f553e134a63779916b72f923f19c92f603ecfe
 2018-04-12 09:01:00 -07:00
TreeHugger Robot
52ae06af4d Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev 2018-04-12 15:53:03 +00:00
Stanley Tng
cb3222d662 Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" 
am: 0980006a2a

Change-Id: I3aec5bce2861518d79ae80dd32562d83bc0c7ef4
 2018-04-12 08:50:35 -07:00
TreeHugger Robot
3dee3d19c2 Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev 2018-04-12 15:47:30 +00:00
Amin Shaikh
241be4b11c Merge changes I6358cfe3,I00b20bd7 into pi-dev am: ef85bbfe4d 
am: 32845a5e36

Change-Id: I8581b2f954595d48c74db36604e6c905b10a73ee
 2018-04-12 08:17:33 -07:00
Julia Reynolds
eac2da20b0 Pre P apps can't change new fields 
Screen off means fullscreen intents, lights, and ambient
in P but pre-P mean only lights and full screen intents.

Test: runtest systemui-notification, cts
Change-Id: I83857b5df2f669751df34d58aa645f4102b8e0e4
Fixes: 77470790
 2018-04-12 11:13:46 -04:00
Amin Shaikh
32845a5e36 Merge changes I6358cfe3,I00b20bd7 into pi-dev 
am: ef85bbfe4d

Change-Id: I19b0bc43a480d1759f8412406f3755ab2592fd29
 2018-04-12 08:08:40 -07:00
Rohan Shah
8319f2db3d Merge "[Notif] Allow locking importance on notification" into pi-dev am: 8e7f23a74c 
am: 0c91614746

Change-Id: I2710212987e9647d23d80d972ef826dc2358c53e
 2018-04-12 08:08:13 -07:00
Rohan Shah
0c91614746 Merge "[Notif] Allow locking importance on notification" into pi-dev 
am: 8e7f23a74c

Change-Id: I7ddba513e0173fbaba844ea7dea61861a5f77951
 2018-04-12 07:58:28 -07:00
Jason Monk
a3e5552c47 Revert "Clear out tuner prefs since it is disabled" 
Bug: 74851117
Fixes: 77937472
This reverts commit 8bb9bbf152.

Change-Id: I2dea3fec7ca3f59c63ce9395ba2784ca9dc58316
 2018-04-12 14:58:06 +00:00
TreeHugger Robot
ef85bbfe4d Merge changes I6358cfe3,I00b20bd7 into pi-dev 
* changes:
  Fix status icon tint in QQS.
  Fix QQS side padding for icons and tiles.
 2018-04-12 14:55:55 +00:00
Adrian Roos
d5a59ba94b Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev am: 819fffaf1d 
am: a525b0796e

Change-Id: I8c7ac203d05724b5dcae66bc05e36c8bf31e711d
 2018-04-12 07:54:11 -07:00
Rohan Shah
8e7f23a74c Merge "[Notif] Allow locking importance on notification" into pi-dev 2018-04-12 14:49:11 +00:00
Adrian Roos
a525b0796e Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev 
am: 819fffaf1d

Change-Id: I83f228f42789b40816c39b517c53e35ae74f2554
 2018-04-12 07:42:59 -07:00
Stanley Tng
0980006a2a Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" 2018-04-12 14:36:12 +00:00
TreeHugger Robot
819fffaf1d Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev 2018-04-12 14:35:33 +00:00
Tony Mak
df53578425 Check in the new work profile icon 
Test: Settings -> Google -> Observe the icon
Fixes: 77952474

Change-Id: I7b26651bbc06aa496ae98f3030a3a1458ffdba1f
 2018-04-12 14:34:45 +00:00
richard chou
aa6043a3c5 Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev am: f6840a17ff 
am: e7e1f44364

Change-Id: Ibe760e8622179c16b1311c05ccc659f194af789e
 2018-04-12 06:52:17 -07:00
richard chou
e7e1f44364 Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev 
am: f6840a17ff

Change-Id: If3a7bd8e0d9c72718761c3508dd898abef00e3c8
 2018-04-12 06:42:08 -07:00
TreeHugger Robot
f6840a17ff Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev 2018-04-12 13:32:35 +00:00
Android Build Merger (Role)
8dffe42cb9 Merge "Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa am: b129fadef8" 2018-04-12 12:47:09 +00:00
Wale Ogunwale
cbb04c868d Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa 
am: b129fadef8

Change-Id: I9b8414b89138651f3b3132789cae59ad6780dbb6
 2018-04-12 05:45:08 -07:00
Jason Chang
bf0dffad8a Merge "[SettingsLib] Update Utils APIs usage" 2018-04-12 12:44:04 +00:00
Wale Ogunwale
b129fadef8 Merge "Clean up APIs before declaring API 28." into pi-dev 
am: fb10508cfa

Change-Id: Ic20ef429dbae1c9c5702094e1203838517b3ec38
 2018-04-12 05:33:09 -07:00
Wale Ogunwale
fb10508cfa Merge "Clean up APIs before declaring API 28." into pi-dev 2018-04-12 12:19:56 +00:00
Jorim Jaggi
0763ed2670 Merge "Fix issue with leaked preserved surface" into pi-dev am: 682ca4122d 
am: 2545afe577

Change-Id: Ibbd6d86cebc846ace677eaf15bdcdd7f37c8ebc3
 2018-04-12 04:35:35 -07:00