Commit Graph

361249 Commits

Author SHA1 Message Date
Bill Yi
8258cfd64e Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7ed02e2060  -s ours

Change-Id: I79377ddd3573edd760b35b24db9324f965c9503e
2018-03-06 23:09:40 +00:00
Bill Yi
830d632e70 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 344907b937  -s ours

Change-Id: I9ff71f760f9a1a721d17ee3129672c3cf4a6b0d2
2018-03-06 23:09:05 +00:00
Bill Yi
01cbefa877 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 6ae8c53786  -s ours

Change-Id: I56ec26843c1e07d99da1e71df231ffc74b2b3417
2018-03-06 23:07:44 +00:00
Bill Yi
4baa37fee5 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 8e7bfb494f  -s ours

Change-Id: Ic15b18e9263a0158a9362cb180b35d0608d6c4a8
2018-03-06 22:56:31 +00:00
Lucas Dupin
13100c09ea Merge "WallpaperColors hint computation" into pi-dev
am: 29d047bab8

Change-Id: I120590fe320065573eafa32fbf6ab4807495dc11
2018-03-06 22:45:35 +00:00
Bill Yi
6b052f1f4a Merge "Import translations. DO NOT MERGE" into pi-dev
am: 1543a4ea0d  -s ours

Change-Id: I8085eb2005da8875abd5fe82d6d9b967758aa9f8
2018-03-06 22:40:41 +00:00
Bill Yi
3b60e2c77b Merge "Import translations. DO NOT MERGE" into pi-dev
am: 595dd3f75a  -s ours

Change-Id: I4d41c5820225b465b6b44e2ce16491c0deb3805d
2018-03-06 22:35:29 +00:00
Chavi Weingarten
928f3f28ee Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on." into pi-dev
am: fb6531d3df

Change-Id: I09c1c970ce61a2b71fa3fdc513388febe472e088
2018-03-06 22:28:26 +00:00
TreeHugger Robot
7ed02e2060 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:21:48 +00:00
Lucas Dupin
9ed24f902a Merge "Increase char limit of keyguard messages" into pi-dev
am: 8715cf78f1

Change-Id: Ieb76251c4bb632f7fe0cae8dfbdb6b02399aa174
2018-03-06 22:20:44 +00:00
TreeHugger Robot
344907b937 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:20:13 +00:00
TreeHugger Robot
6ae8c53786 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:19:54 +00:00
TreeHugger Robot
8e7bfb494f Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:19:50 +00:00
TreeHugger Robot
29d047bab8 Merge "WallpaperColors hint computation" into pi-dev 2018-03-06 22:16:50 +00:00
Bill Yi
42f2594487 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 45e75a9c4c  -s ours

Change-Id: Ie810cf2b5a438fe97b87f3f2021868b08b11f907
2018-03-06 22:15:36 +00:00
Hall Liu
2351526cc8 Merge "Add an app-ops check when registering for location" into pi-dev
am: 67f9d52502

Change-Id: Ic5d2127ce3a3313a1d00a45809a58b6c7fad27ec
2018-03-06 22:12:40 +00:00
TreeHugger Robot
1543a4ea0d Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:06:58 +00:00
Julia Reynolds
e56a22248b Merge "metrics constants for app ops." into pi-dev
am: 200de1cc86

Change-Id: I04d4758ea3c25307e71a5d9cf7107fbf7cc932cd
2018-03-06 22:06:18 +00:00
TreeHugger Robot
595dd3f75a Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 22:05:06 +00:00
Chavi Weingarten
fb6531d3df Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on." into pi-dev 2018-03-06 22:04:35 +00:00
Lucas Dupin
8715cf78f1 Merge "Increase char limit of keyguard messages" into pi-dev 2018-03-06 21:55:48 +00:00
TreeHugger Robot
45e75a9c4c Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 21:54:25 +00:00
TreeHugger Robot
67f9d52502 Merge "Add an app-ops check when registering for location" into pi-dev 2018-03-06 21:51:43 +00:00
Julia Reynolds
200de1cc86 Merge "metrics constants for app ops." into pi-dev 2018-03-06 21:44:53 +00:00
Android Build Merger (Role)
d634e995c9 Merge "Merge "Customize the WCDMA signal strength based on RSCP" am: c2925aff38 am: e733d196dc" into pi-dev-plus-aosp 2018-03-06 21:04:39 +00:00
Jordan Liu
199f911455 Merge "Customize the WCDMA signal strength based on RSCP" am: c2925aff38
am: e733d196dc

Change-Id: I98bf9c0fb4333abb5ed2f3e354f3d4ed416d240e
2018-03-06 21:04:00 +00:00
Yi Jin
db8bc9ba01 Merge "Use uint64_t instead of long long as API type for consistent reason." into pi-dev
am: 88840820d0

Change-Id: I87fe28665b2fa05d54bd2cd5a55728bcad0659c2
2018-03-06 21:03:49 +00:00
Jeffrey Vander Stoep
c6667aada1 Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev
am: 1d03b9489e

Change-Id: I1fcbe7768bc34528b900dd47218fedc7d06ce661
2018-03-06 20:59:08 +00:00
Android Build Merger (Role)
d34b180aea Merge "Merge "Fix notification padding and slice collision" into pi-dev am: 0719d0790c" into pi-dev-plus-aosp 2018-03-06 20:53:08 +00:00
Lucas Dupin
2e6cc6a204 Merge "Fix notification padding and slice collision" into pi-dev
am: 0719d0790c

Change-Id: I70fea996d9f78fd68ff888c5d2deec2a76c54582
2018-03-06 20:52:51 +00:00
Siddharth Ray
e4dc31af22 Merge "Obtain cellular related battery statistics" am: 4b0172bcb6
am: a09adc6db1  -s ours

Change-Id: Ifadbf09accabc5b2ba875c6430cd38415fce3a6c
2018-03-06 20:51:53 +00:00
David Brazdil
50263c9cce Merge "Add more APIs into hidden API light greylist" into pi-dev
am: 99c5b70646

Change-Id: If9425e3e9417e9117235d513d36d6533599b096d
2018-03-06 20:48:10 +00:00
Andrii Kulian
4e094a5a83 Merge "DO NOT MERGE Don't send config change when display is removed" into pi-dev
am: 98396d2de4

Change-Id: I1a26998296be54da90556f893da6b1a7fd492480
2018-03-06 20:43:27 +00:00
Jordan Liu
e733d196dc Merge "Customize the WCDMA signal strength based on RSCP"
am: c2925aff38

Change-Id: I226f147316121a982526e4aa4111e9ed41215757
2018-03-06 20:31:20 +00:00
TreeHugger Robot
88840820d0 Merge "Use uint64_t instead of long long as API type for consistent reason." into pi-dev 2018-03-06 20:31:01 +00:00
Andreas Gampe
77a7a4997d Merge "Accounts: Fix TokenCache maps access" am: b06de7892a
am: c311914042

Change-Id: I5ca61d48c103c33cd790698c097f581e76e354fc
2018-03-06 20:29:24 +00:00
Eric Erfanian
258d6985dd Merge "Update the RTT features constant." am: c18b175d87
am: 1a59a97a0c  -s ours

Change-Id: I773ce15460240ebbbdc232449baf40e07e9ce0a5
2018-03-06 20:22:48 +00:00
TreeHugger Robot
1d03b9489e Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev 2018-03-06 20:14:26 +00:00
TreeHugger Robot
0719d0790c Merge "Fix notification padding and slice collision" into pi-dev 2018-03-06 20:13:48 +00:00
TreeHugger Robot
99c5b70646 Merge "Add more APIs into hidden API light greylist" into pi-dev 2018-03-06 20:12:24 +00:00
TreeHugger Robot
98396d2de4 Merge "DO NOT MERGE Don't send config change when display is removed" into pi-dev 2018-03-06 20:08:34 +00:00
Siddharth Ray
a09adc6db1 Merge "Obtain cellular related battery statistics"
am: 4b0172bcb6

Change-Id: I364d329e92a6bd92ce601d34c94a92c91f09eb38
2018-03-06 20:08:15 +00:00
Andreas Gampe
b2aea203cf Merge "Camera: Fix map access" am: 8796d95475
am: f17dcdaea9

Change-Id: I72e9146ed8d21974af3cfe8b209571ebe8c93a3b
2018-03-06 20:06:06 +00:00
Andreas Gampe
c311914042 Merge "Accounts: Fix TokenCache maps access"
am: b06de7892a

Change-Id: Idb4409a7ac83326f178a176364c4a08b3716b64c
2018-03-06 20:03:33 +00:00
Lucas Dupin
9e64f8260d Merge "Do not allow ScrimView backgrounds" into pi-dev
am: b6238ed540

Change-Id: If02fcf7c2347f31d36067ac06672cfa361653fa7
2018-03-06 20:02:37 +00:00
Eric Erfanian
1a59a97a0c Merge "Update the RTT features constant."
am: c18b175d87

Change-Id: Ic4419be53f3390336a5b95abe34a03944b3437e4
2018-03-06 19:58:14 +00:00
Remi NGUYEN VAN
d2832e320b Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a
am: a6905db1d8

Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
2018-03-06 19:52:57 +00:00
Bill Yi
027b8b49ec Import translations. DO NOT MERGE
Change-Id: I88fe34f22e5c9d5acb30a0647979ab0fa7a44a50
Auto-generated-cl: translation import
2018-03-06 11:49:27 -08:00
Android Build Merger (Role)
8b2817d0e1 Merge "Merge "Expose Process.isIsolated()" into pi-dev am: 6ddf443d15" into pi-dev-plus-aosp 2018-03-06 19:45:49 +00:00
Andreas Gampe
f17dcdaea9 Merge "Camera: Fix map access"
am: 8796d95475

Change-Id: Ife74759ff109b1b885420db408e6a6e0c3bb1388
2018-03-06 19:45:39 +00:00