OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Change directory where apns-conf.xml is stored" am: d25198f62f am: d15962b260
Jordan Liu [Mon, 21 May 2018 22:07:39 +0000 (15:07 -0700)]
Merge "Change directory where apns-conf.xml is stored" am: d25198f62f am: d15962b260
am: 0bdaa497a5

Change-Id: Ia2f81c8a006df622bfce244693eb883acb123cf2

6 years agoMerge "Change directory where apns-conf.xml is stored" am: d25198f62f
Jordan Liu [Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)]
Merge "Change directory where apns-conf.xml is stored" am: d25198f62f
am: d15962b260

Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab

6 years agoMerge "Change directory where apns-conf.xml is stored"
Jordan Liu [Mon, 21 May 2018 21:20:34 +0000 (14:20 -0700)]
Merge "Change directory where apns-conf.xml is stored"
am: d25198f62f

Change-Id: I33db5a97978e17d82da98344c25788fc3bb42e89

6 years agoMerge "Remove unnecessary references to libunwind."
Christopher Ferris [Mon, 21 May 2018 21:14:10 +0000 (21:14 +0000)]
Merge "Remove unnecessary references to libunwind."

6 years ago[automerger skipped] Merge "DO NOT MERGE - Switch user picker/switcher to use CarUser...
Ying Zheng [Mon, 21 May 2018 21:02:40 +0000 (14:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev am: ab38e73af6
am: ffcd82cad0  -s ours

Change-Id: I9148f59b3abb6fa246d4025700e06d4d1d1ac8ea

6 years agoMerge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into...
Ying Zheng [Mon, 21 May 2018 20:54:58 +0000 (13:54 -0700)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
am: ab38e73af6

Change-Id: I99bed9c05a1cb49757f3f330d672f6dc4d10615f

6 years agoMerge "Fix the Hearing Aids connected state in Settings App" into pi-dev am: aef6efeef5
Stanley Tng [Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev am: aef6efeef5
am: 898361c1c4

Change-Id: I4a9b9c0c0cde059e3de2d4184e5a43dc445d9a69

6 years agoMerge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into...
Ying Zheng [Mon, 21 May 2018 20:44:23 +0000 (20:44 +0000)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev

6 years agoMerge "Fix the Hearing Aids connected state in Settings App" into pi-dev
Stanley Tng [Mon, 21 May 2018 20:39:49 +0000 (13:39 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
am: aef6efeef5

Change-Id: Ic4ac46d5de65f83ca9e5b27bef44de17c5b94fe8

6 years agoMerge "Extend rotation button timeout duration" into pi-dev am: 4b0351d53f
Mike Digman [Mon, 21 May 2018 20:35:19 +0000 (13:35 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev am: 4b0351d53f
am: 19e32a0e63

Change-Id: I92ddc0d19b3eb72973064900416892b18e505287

6 years agoMerge "Extend rotation button timeout duration" into pi-dev
Mike Digman [Mon, 21 May 2018 20:25:56 +0000 (13:25 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev
am: 4b0351d53f

Change-Id: Ia6c3008ac77389e9e04a9ce1cab7d0a49c6d29d3

6 years agoMerge "Allow UiAutomation being used off the main thread" into pi-dev am: c81ed627ab
Svet Ganov [Mon, 21 May 2018 20:25:50 +0000 (13:25 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev am: c81ed627ab
am: 13a27a82a2

Change-Id: Ib7645f1b350ba0e7ed571eb98e739d0a31c4e435

6 years agoMerge "Allow UiAutomation being used off the main thread" into pi-dev
Svet Ganov [Mon, 21 May 2018 20:20:56 +0000 (13:20 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
am: c81ed627ab

Change-Id: I7fe9c3d9eb3f291698501ef23fdd449f41d0e3d1

6 years agoMerge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev am: d0897f2b65
Suprabh Shukla [Mon, 21 May 2018 20:20:37 +0000 (13:20 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev am: d0897f2b65
am: 485cdce1ca

Change-Id: I6f60f14a705e354fab5f08382a146be7f9dd9f2d

6 years agoMerge "Fix the Hearing Aids connected state in Settings App" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:20:31 +0000 (20:20 +0000)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev

6 years agoMerge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
Suprabh Shukla [Mon, 21 May 2018 20:11:40 +0000 (13:11 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
am: d0897f2b65

Change-Id: Ia624b12b32d06b7e341f7023231000ffb1fb530b

6 years agoMerge "Make RemoteCallback test API" into pi-dev am: a757fd7827
Svetoslav Ganov [Mon, 21 May 2018 20:11:12 +0000 (13:11 -0700)]
Merge "Make RemoteCallback test API" into pi-dev am: a757fd7827
am: 573a696f8f

Change-Id: Iab9be37d714d1d1b8eec032d9dabbcd5cb056834

6 years agoMerge "Extend rotation button timeout duration" into pi-dev
Mike Digman [Mon, 21 May 2018 20:09:24 +0000 (20:09 +0000)]
Merge "Extend rotation button timeout duration" into pi-dev

6 years agoMerge "Make RemoteCallback test API" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 20:04:51 +0000 (13:04 -0700)]
Merge "Make RemoteCallback test API" into pi-dev
am: a757fd7827

Change-Id: Iea481e8a4716bddf48a64d9370d248ffa7871158

6 years agoMerge "Allow UiAutomation being used off the main thread" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:03:10 +0000 (20:03 +0000)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev

6 years agoMerge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev

6 years agoMerge "Make RemoteCallback test API" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Make RemoteCallback test API" into pi-dev

6 years agoMerge "Check for bpf support at NetworkStatsService start" into pi-dev am: 6555a9fa16
Chenbo Feng [Mon, 21 May 2018 19:50:12 +0000 (12:50 -0700)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev am: 6555a9fa16
am: e20463ba06

Change-Id: Ib5acef029a83ce8fa219a8b7d1edc17c71fc2df5

6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
Lucas Dupin [Mon, 21 May 2018 19:45:48 +0000 (12:45 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
am: 1c63bdcce2

Change-Id: I38cfb0e6560e70c4a9bb66d48a18cdc5d84b89f8

6 years agoMerge "Check for bpf support at NetworkStatsService start" into pi-dev
Chenbo Feng [Mon, 21 May 2018 19:44:23 +0000 (12:44 -0700)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
am: 6555a9fa16

Change-Id: If2fd9e040e4717f1040c16e4b5f6c61cfc14e140

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev am: 711a8f7f28
Yohei Yukawa [Mon, 21 May 2018 19:40:59 +0000 (12:40 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev am: 711a8f7f28
am: 682b36a5ae

Change-Id: Ia0269a871d174e02a9d3a8a59d6f5be92cde3f9b

6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev
Lucas Dupin [Mon, 21 May 2018 19:36:44 +0000 (12:36 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev
am: 402e2a2b6f

Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev
Yohei Yukawa [Mon, 21 May 2018 19:29:13 +0000 (12:29 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
am: 711a8f7f28

Change-Id: I7ac74ec1076ad7160475b9595e00db85eea9f818

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
Yangster-mac [Mon, 21 May 2018 19:27:13 +0000 (12:27 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev am: 76cb7fe2f6
am: 02b40158ab

Change-Id: I7445eb13283b007738182e2a5ac4808a87124a11

6 years agoMerge "Check for bpf support at NetworkStatsService start" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 19:19:59 +0000 (19:19 +0000)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev

6 years agoMerge "Clean up Bitmap allocation size computation."
Ben Wagner [Mon, 21 May 2018 19:19:08 +0000 (19:19 +0000)]
Merge "Clean up Bitmap allocation size computation."

6 years agoMerge "Change directory where apns-conf.xml is stored"
Jordan Liu [Mon, 21 May 2018 19:06:54 +0000 (19:06 +0000)]
Merge "Change directory where apns-conf.xml is stored"

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am: fd37ec90b8
Ryan Mitchell [Mon, 21 May 2018 19:06:13 +0000 (12:06 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am: fd37ec90b8
am: b3da3a9673

Change-Id: Ic715bc6db56328c47da4a30a3e46ea92bbf10f92

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
Yangster-mac [Mon, 21 May 2018 19:01:32 +0000 (12:01 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
am: 76cb7fe2f6

Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e...
Bill Yi [Mon, 21 May 2018 18:57:10 +0000 (11:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e5e69  -s ours
am: 33ad5a99dd  -s ours

Change-Id: Ifc05f3503a635804c9008e28ccc5cf807f69905b

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
Ryan Mitchell [Mon, 21 May 2018 18:53:56 +0000 (11:53 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
am: fd37ec90b8

Change-Id: I3030d62104142b33dfb9844faa2fcb9840d8ee61

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 346e04...
Bill Yi [Mon, 21 May 2018 18:43:21 +0000 (11:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 346e04785d  -s ours
am: 491a78548b  -s ours

Change-Id: I31e6a4d193027b9bad66d36e391bff93be6928b6

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 35426e5e69  -s ours

Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
Andreas Gampe [Mon, 21 May 2018 18:41:58 +0000 (11:41 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
am: 1c015160c6

Change-Id: Id3bd33caa4137b36b7ead74689bf2c0aaa09e3d4

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f28ef4...
Bill Yi [Mon, 21 May 2018 18:37:07 +0000 (11:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f28ef47762  -s ours
am: 38f9bb955a  -s ours

Change-Id: I58084ac82e5999d5ff8443cc1fddbbea99a1cbee

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 374343...
Bill Yi [Mon, 21 May 2018 18:35:29 +0000 (11:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3743438f5e  -s ours
am: 3047866348  -s ours

Change-Id: I807d5fc4dec148159c2dcd57292b7dc6661491bf

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221...
Bill Yi [Mon, 21 May 2018 18:32:56 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221a361  -s ours
am: 7fb9123a74  -s ours

Change-Id: Ia18a28f533332b12ad01856a81041ff3071d53b6

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 346e04785d  -s ours

Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: addcc2...
Bill Yi [Mon, 21 May 2018 18:31:06 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: addcc20dd4  -s ours
am: 06d509f642  -s ours

Change-Id: I0f94f3a65fd6215824d3743025d8902e995c096e

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9
Andreas Gampe [Mon, 21 May 2018 18:25:06 +0000 (11:25 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9
am: 2d47ac0df7

Change-Id: Ie4274380bb66a35a6ba12d0f868ae78ef80f4b0d

6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev
Lucas Dupin [Mon, 21 May 2018 18:23:59 +0000 (18:23 +0000)]
Merge "Keep scrim black when "always on" is off" into pi-dev

6 years agoExtend rotation button timeout duration
Mike Digman [Mon, 21 May 2018 18:23:56 +0000 (11:23 -0700)]
Extend rotation button timeout duration

Moving from 6s to 10s timeout when navbar is visible.

Change-Id: I3a7067c37f254698ae53fdb9208576f3e486c8ce
Fixes: 79981820
Test: manual

6 years agoDO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper.
Ying Zheng [Thu, 10 May 2018 20:02:07 +0000 (13:02 -0700)]
DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper.

Test: Build
Bug: 79417730
Change-Id: I52c9b0f5ba01b85e36242b112ef9bbcc54a08e48

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:18:24 +0000 (11:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f28ef47762  -s ours

Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 18:18:03 +0000 (11:18 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76 am: b138eaa7b7
am: 370e6da71a

Change-Id: I992104d24ba9708f8ccb34a2871c2104acf6f9ec

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping"
Andreas Gampe [Mon, 21 May 2018 18:17:24 +0000 (11:17 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping"
am: 923208e8c9

Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:17:01 +0000 (11:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3743438f5e  -s ours

Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 18:15:43 +0000 (18:15 +0000)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:13:26 +0000 (11:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 998221a361  -s ours

Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: addcc20dd4  -s ours

Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 18:10:57 +0000 (11:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours am: 5e1f17a880  -s ours am: 91d2623fe0  -s ours
am: 654d5044ef  -s ours

Change-Id: I403ab21dbffb7d9b091d412a3504cedd1aca9f2f

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
TreeHugger Robot [Mon, 21 May 2018 18:05:00 +0000 (18:05 +0000)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 18:04:38 +0000 (11:04 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76
am: b138eaa7b7

Change-Id: Idf0ba5b3480762902f3df610bd313653c2111550

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:59:35 +0000 (17:59 +0000)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:57:38 +0000 (10:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours am: 5e1f17a880  -s ours
am: 91d2623fe0  -s ours

Change-Id: I66d8b302db8bd7f2397cfeff65a73fa96f6c28fa

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:57:26 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:56:41 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:35 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:31 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:53:32 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:51:35 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years ago[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b...
Bernie Innocenti [Mon, 21 May 2018 17:42:13 +0000 (10:42 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b1e85e  -s ours
am: 7ef34d8629  -s ours

Change-Id: I2ce8a520f0bb744329bb7c9c2782bdbc1f8ace3f

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 17:41:15 +0000 (10:41 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da
am: aa55d5db76

Change-Id: If6e65aa957489e085d1a96be0367e158c43ebc5b

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:34:57 +0000 (10:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours
am: 5e1f17a880  -s ours

Change-Id: I5fdb579286d6ddce6f6a20b2fab243b33840bf93

6 years ago[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
Bernie Innocenti [Mon, 21 May 2018 17:32:00 +0000 (10:32 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: 0ec7b1e85e  -s ours

Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 17:28:44 +0000 (10:28 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e
am: d88c6877da

Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi...
Roshan Pius [Mon, 21 May 2018 17:26:51 +0000 (10:26 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev am: 95509057f8
am: dee99a1b2b

Change-Id: I9274ba934a102a17d554133caed5ede6cce551b0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:24:41 +0000 (10:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours
am: a53d91e485  -s ours

Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792

6 years agoFix the Hearing Aids connected state in Settings App
Stanley Tng [Sun, 13 May 2018 22:08:33 +0000 (15:08 -0700)]
Fix the Hearing Aids connected state in Settings App

When two Hearing Aids devices are bonded, we should only show one device
in the Settings App and at the correct location based on the connected
state of the HA devices. When at least one HA device is connected, then
the Settings App should show it as connected. Otherwise, the Settings
App should show it as disconnected when both devices are disconnected.

Bug: 79760469
Test: Run the robotests for Settings and SettingsLib
Change-Id: I33e19af054b686b3d71b00dcbd6ff16febde6099

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
Roshan Pius [Mon, 21 May 2018 17:20:11 +0000 (10:20 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
am: 95509057f8

Change-Id: I73fc1ed24e79689315ed5d4501a412afce24f6e8

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
Bill Yi [Mon, 21 May 2018 17:19:31 +0000 (10:19 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
am: 99e6aa1b1e

Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:17:56 +0000 (10:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
am: 4f1f428661  -s ours

Change-Id: Iac8c22f36859d6648ae856236c9a97080238cae5

6 years agoKeep scrim black when "always on" is off
Lucas Dupin [Sat, 19 May 2018 00:24:52 +0000 (17:24 -0700)]
Keep scrim black when "always on" is off

The first frame when waking up is expensive and we
need a black scrim hiding what was left behind.

Bug: 78022321
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I99e2b7960daf2cbe51bec6aee4b15c74d532078c

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
Roshan Pius [Mon, 21 May 2018 17:04:10 +0000 (17:04 +0000)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
  Import translations. DO NOT MERGE

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping"
Treehugger Robot [Mon, 21 May 2018 16:59:17 +0000 (16:59 +0000)]
Merge "ActivityManager: Fix slow-app ANR dumping"

6 years agoAllow UiAutomation being used off the main thread
Svet Ganov [Sun, 20 May 2018 01:52:40 +0000 (18:52 -0700)]
Allow UiAutomation being used off the main thread

Test: cts-tradefed run cts -m CtsUiAutomationTestCases
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts-instant -m CtsAccessibilityServiceTestCases

bug:80024164

Change-Id: I72c565d28f4cbcf6775535fb846b268b785a6b34

6 years agoAdd a shell command for IMMS to test instant apps
Yohei Yukawa [Mon, 21 May 2018 16:47:53 +0000 (09:47 -0700)]
Add a shell command for IMMS to test instant apps

This change adds a shell command to allow InputMethodManagerService
(IMMS) to bind to InputMethodService provided by instant apps, like we
did so for AccessibilityManagerService [1].  Note that binding to an
InputMethodService provided by instant apps is not a supported
scenario.  In theory we can avoid doing this by having a separate APK
for MockIme instead of putting everything into
CtsInputMethodTestCases.apk but that configuration is not yet
supported by our test harness hence it doesn't work right now hence
having this special mode for testing is the only way we have right
now.

 [1]: Ifced735a9a6e495747372dd8b00fdd64933a09c7
      d223db316d11a625a73f86392e7055d5c6f26e7d

Bug: 79484568
Test: Manually verified as follows:
  1. Build a test IME that has android:targetSandboxVersion="2" in its
     AndroidManifest.xml.
  2. Install the test IME APK with 'adb install --instant <APK>'
  3. adb shell ime list -a -s
  4. Make sure that the test IME is not in the list.
  5. adb shell cmd input_method set-bind-instant-service-allowed true
  6. adb shell ime list -a -s
  7. Make sure that the test IME is now in the list.
  8. Select that test IME.
  9. Make sure that the test IME is working.
 10. adb shell cmd input_method set-bind-instant-service-allowed false
 11. Make sure that the test IME is no longer the current IME.
 12. adb shell ime list -a -s
 13. Make sure that the test IME is no longer in the list.
Test: cts-tradefed run cts-instant -m CtsInputMethodTestCases
Change-Id: I4383129fd9e229a849282e874aff5d4eef1f49f8

6 years agoChange directory where apns-conf.xml is stored
Niklas Lindgren [Fri, 18 May 2018 12:48:43 +0000 (14:48 +0200)]
Change directory where apns-conf.xml is stored

When apns are downloaded OTA they are stored directly under data/misc
by system server. Files created there gets assigned with file context
system_data_file which TelephonyProvider cannot read.

In order to make sure that downloaded apns gets a file context TelephonyProvider
can read we create an apns sub directory in init where radio_data_file:s are
created. The data path to where apns-conf is stored is here changed from /data/misc/
to /data/misc/apns/.

This change is aligned with other files that ConfigUpdateInstallReceiver writes.

Test: Trigger Apn update via intent UPDATE_APN_DB
Go to settings/apn-list and verify that newly downloaded are present
Bug: 79948106

Change-Id: I5a9ec262bfbac291cca9fee5accf93eb6c06f253

6 years agoMerge changes from topic "apf-read-ram"
Bernie Innocenti [Mon, 21 May 2018 16:40:29 +0000 (09:40 -0700)]
Merge changes from topic "apf-read-ram"
am: b5dda0e316

Change-Id: I80d70e5bce6d1a0903599e98d2d251459df1292a

6 years agoMerge "BootParameters: Support silent boot."
Mickey Keeley [Mon, 21 May 2018 16:18:58 +0000 (16:18 +0000)]
Merge "BootParameters: Support silent boot."

6 years agoMake RemoteCallback test API
Svet Ganov [Wed, 16 May 2018 04:39:20 +0000 (21:39 -0700)]
Make RemoteCallback test API

Test: manual

bug:79782915

Change-Id: I61343573428333c0d4a9ee2523c444753280186c

6 years agoMerge changes from topic "apf-read-ram"
Treehugger Robot [Mon, 21 May 2018 15:33:28 +0000 (15:33 +0000)]
Merge changes from topic "apf-read-ram"

* changes:
  apf: Add counters for dropped / passed packets
  Add support for reading a snapshot of the APF data

6 years agoMerge "Status bar icons 15 dp" into pi-dev am: 97abc762cc
Evan Laird [Mon, 21 May 2018 15:14:03 +0000 (08:14 -0700)]
Merge "Status bar icons 15 dp" into pi-dev am: 97abc762cc
am: 4811db16a5

Change-Id: I75f145a1cd7445674964e0e7b1127290df3bad87

6 years agoMerge "Status bar icons 15 dp" into pi-dev
Evan Laird [Mon, 21 May 2018 15:06:29 +0000 (08:06 -0700)]
Merge "Status bar icons 15 dp" into pi-dev
am: 97abc762cc

Change-Id: I9d33e4b766952a29ef67fabc17a2ed47ba9114ef

6 years agoMerge "Status bar icons 15 dp" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 14:55:11 +0000 (14:55 +0000)]
Merge "Status bar icons 15 dp" into pi-dev

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev am: 80f0481628
Ye Wen [Mon, 21 May 2018 14:47:14 +0000 (07:47 -0700)]
Merge "Allow user to change AiAi's permissions." into pi-dev am: 80f0481628
am: a97e688db3

Change-Id: I7b503e6d380330932a6b620fcf142926e358c835

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev
Ye Wen [Mon, 21 May 2018 14:33:07 +0000 (07:33 -0700)]
Merge "Allow user to change AiAi's permissions." into pi-dev
am: 80f0481628

Change-Id: I31410b69de5de58549e3c218888117abefc3924c

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev
Ye Wen [Mon, 21 May 2018 14:19:55 +0000 (14:19 +0000)]
Merge "Allow user to change AiAi's permissions." into pi-dev

6 years agoClean up Bitmap allocation size computation.
Ben Wagner [Fri, 18 May 2018 21:46:48 +0000 (17:46 -0400)]
Clean up Bitmap allocation size computation.

In addition to making this do what is intended in both debug and
release, this removes some of the last uses of sk_64_isS32 and
sk_64_asS32 so that they can be removed.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4cd9fb124719f8e7e23db6bf268cbda64c29d283

6 years agoMerge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to retur...
TreeHugger Robot [Mon, 21 May 2018 10:23:17 +0000 (10:23 +0000)]
Merge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 21 May 2018 00:01:33 +0000 (17:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I99ed00eac259f67c341c1a82a547221bb7082e1f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 22:13:14 +0000 (15:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id52e0cc164ebb1c62710dfc81b4bf70d231e08fb

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 22:06:11 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I11a29c0ab563be1a3a6bdf96fc82e719ce98e9c4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 20:11:33 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5e753540af680ab9f8514066a9b164cd51a149ce