OSDN Git Service
Jean-Michel Trivi [Fri, 23 Dec 2016 01:11:12 +0000 (17:11 -0800)]
Do not translate system-reserved stream type names
Do not translate the names of stream types that are reserved
for the internal workings of the audio system, and are
never meant to be read by the end user.
Also fix the string for STREAM_TTS.
Test: make
Bug:
33790976
Change-Id: Ied97b1ad38ad90911ac41ed277a618bc50c531c4
Jeremy Joslin [Thu, 22 Dec 2016 19:38:59 +0000 (19:38 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4 am:
8eff13b521 am:
deddce7ff6
am:
10524f61f5 -s ours
Change-Id: I6706e4d3c292a00b47ea6fe835aa986c72e98350
Jeremy Joslin [Thu, 22 Dec 2016 19:37:49 +0000 (19:37 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc am:
d79019a616 am:
268176317b
am:
7d26ab59cd -s ours
Change-Id: I15813561ed89e8b3f8c434a5ec2246d5cb50fab0
Jeremy Joslin [Thu, 22 Dec 2016 19:36:38 +0000 (19:36 +0000)]
Clear and restore the calling ID. am:
29ed4a99bf am:
3588b8d44c am:
3f32d12be0
am:
7af07643f3 -s ours
Change-Id: I09464c8037545f80d9a78f5f2e7b5bfc3ce65ea0
Jeremy Joslin [Thu, 22 Dec 2016 19:24:17 +0000 (19:24 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4 am:
8eff13b521
am:
deddce7ff6
Change-Id: I0026c9b1fed0e8eeab95a1d0c03f8235c7643c62
Jeremy Joslin [Thu, 22 Dec 2016 19:22:44 +0000 (19:22 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc am:
d79019a616
am:
268176317b
Change-Id: I3fcfd02759c9748b4e00a5e825b670259c0d0263
Jeremy Joslin [Thu, 22 Dec 2016 19:21:45 +0000 (19:21 +0000)]
Clear and restore the calling ID. am:
29ed4a99bf am:
3588b8d44c
am:
3f32d12be0
Change-Id: I2cbf3ca1ff0a743de1b08fad467027ec59333def
Alex Klyubin [Thu, 22 Dec 2016 19:20:26 +0000 (11:20 -0800)]
resolve merge conflicts of
a9888fc to master
Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967
Jeremy Joslin [Thu, 22 Dec 2016 19:12:47 +0000 (19:12 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4
am:
8eff13b521
Change-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d
Jeremy Joslin [Thu, 22 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc
am:
d79019a616
Change-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483
Jeremy Joslin [Thu, 22 Dec 2016 19:10:46 +0000 (19:10 +0000)]
Clear and restore the calling ID. am:
29ed4a99bf
am:
3588b8d44c
Change-Id: I43b6f2899b5d82d4781937766907d6d7afa6b2bd
Alex Klyubin [Thu, 22 Dec 2016 19:06:09 +0000 (19:06 +0000)]
resolve merge conflicts of
febd982 to stage-aosp-master am:
5c53fdb893
am:
b824658494
Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818
Jeremy Joslin [Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)]
Merge changes I40f055df,I562713df
am:
4a04c07df4
Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53
Jeremy Joslin [Thu, 22 Dec 2016 19:02:38 +0000 (19:02 +0000)]
Stay bound to the most current active scorer.
am:
b1365852cc
Change-Id: I8313d23450b47f23f73eb050e6b4244bc0d37622
Jeremy Joslin [Thu, 22 Dec 2016 19:01:43 +0000 (19:01 +0000)]
Clear and restore the calling ID.
am:
29ed4a99bf
Change-Id: Ie5752ca772e6f5c8fed8092d23e0604f44598b24
Alex Klyubin [Thu, 22 Dec 2016 19:01:13 +0000 (19:01 +0000)]
resolve merge conflicts of
febd982 to stage-aosp-master
am:
5c53fdb893
Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
Tom O'Neill [Thu, 22 Dec 2016 18:35:18 +0000 (18:35 +0000)]
Merge "Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411 am:
1cc8a2a617" into nyc-mr2-dev-plus-aosp
am:
52c35fb3a8
Change-Id: I4a11e981e063c370d358175d2d1f6396db65ec38
Tom O'Neill [Thu, 22 Dec 2016 18:35:08 +0000 (18:35 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411 am:
1cc8a2a617
am:
b14ae0e335
Change-Id: Ia0f60d68b8eda909c39984a0052ee38141dd5a71
Tom O'Neill [Thu, 22 Dec 2016 18:33:42 +0000 (18:33 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411 am:
8dc64b729b
am:
a72e75213f
Change-Id: Ifa88d999c4686e8bf262b822809f37ce5ed0fef6
Alan Viverette [Thu, 22 Dec 2016 18:25:19 +0000 (18:25 +0000)]
Merge "Add attribute, theme values for error text color"
Shahriyar Amini [Thu, 22 Dec 2016 18:21:40 +0000 (18:21 +0000)]
Merge "Allow Settings tiles to use content provider data."
Alex Klyubin [Thu, 22 Dec 2016 18:20:23 +0000 (10:20 -0800)]
resolve merge conflicts of
febd982 to stage-aosp-master
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
Pankaj Kanwar [Thu, 22 Dec 2016 18:15:53 +0000 (18:15 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev am:
683dbf1fc6
am:
b4aa5f6e13 -s ours
Change-Id: I613932ff02241d062008aa943cd8db5f098c78ff
Android Build Merger (Role) [Thu, 22 Dec 2016 18:15:30 +0000 (18:15 +0000)]
Merge "Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411 am:
1cc8a2a617" into nyc-mr2-dev-plus-aosp
pkanwar [Thu, 22 Dec 2016 18:14:57 +0000 (18:14 +0000)]
DO NOT MERGE: Add API to indicate carrier networks. am:
9f47a5d85e
am:
aa4d204be7 -s ours
Change-Id: Ibd92cbc56cac770496cf052aabdcf1950bcc474d
Tom O'Neill [Thu, 22 Dec 2016 18:14:47 +0000 (18:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411
am:
1cc8a2a617
Change-Id: I6f4da4dfbadd0b484019b918dff8b161cec2c1ed
Tom O'Neill [Thu, 22 Dec 2016 18:14:42 +0000 (18:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024 am:
f035e8b411
am:
8dc64b729b
Change-Id: I1b83d758c57b21c574de55e4de3a80283d9b7f56
Tom O'Neill [Thu, 22 Dec 2016 18:09:50 +0000 (18:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024
am:
f035e8b411
Change-Id: I6a73e11687db11cd0d6814999e955c20fe7b8ad5
Tom O'Neill [Thu, 22 Dec 2016 18:09:48 +0000 (18:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024
am:
f035e8b411
Change-Id: I0795fffc9f7f79f14038cfb6386bbe308b879db5
Pankaj Kanwar [Thu, 22 Dec 2016 18:04:47 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
am:
683dbf1fc6
Change-Id: If1e5f0f82e18608990500d41211a49e9acbef51f
Tom O'Neill [Thu, 22 Dec 2016 18:04:44 +0000 (18:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e
am:
3b7d90c024
Change-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde
pkanwar [Thu, 22 Dec 2016 18:04:42 +0000 (18:04 +0000)]
DO NOT MERGE: Add API to indicate carrier networks.
am:
9f47a5d85e
Change-Id: Ib0ed3283a55ec285cafa1f120a8545956e27c242
Tom O'Neill [Thu, 22 Dec 2016 17:59:47 +0000 (17:59 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f
am:
2da05d0f9e
Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18
Pankaj Kanwar [Thu, 22 Dec 2016 17:59:08 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
Tom O'Neill [Thu, 22 Dec 2016 17:54:44 +0000 (17:54 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6
am:
7cec76de0f
Change-Id: I9168d45717c26e71bb356dd7304276e23c519bd9
Tom O'Neill [Thu, 22 Dec 2016 17:44:46 +0000 (17:44 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51
am:
56098f81b6
Change-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a
Tom O'Neill [Thu, 22 Dec 2016 17:39:18 +0000 (17:39 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc
am:
1ac8affd51
Change-Id: I965c900e266a9189c595612cef6ddac839498949
Tom O'Neill [Thu, 22 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66
am:
d82f8a67fc
Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86
Tom O'Neill [Thu, 22 Dec 2016 17:29:05 +0000 (17:29 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2
am:
1f458fdc66
Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc
Tom O'Neill [Thu, 22 Dec 2016 17:23:39 +0000 (17:23 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344
am:
d28eef0cc2
Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b
am:
1684e5f344
Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
Tom O'Neill [Thu, 22 Dec 2016 17:14:05 +0000 (17:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516
am:
0a8978f04b
Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
Bill Yi [Thu, 22 Dec 2016 17:10:31 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
1fc63da0e5 -s ours
am:
709844aed4 -s ours
Change-Id: I557182d2ee720189fb033def3c48698f11d81e40
Bill Yi [Thu, 22 Dec 2016 17:09:33 +0000 (17:09 +0000)]
Import translations. DO NOT MERGE am:
7158c89582 -s ours
am:
f794c86972 -s ours
Change-Id: Iabbbe8b6ce4d249bb8457e9b90cf6683949b0c35
Tom O'Neill [Thu, 22 Dec 2016 17:09:09 +0000 (17:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872
am:
3380a77516
Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
Bill Yi [Thu, 22 Dec 2016 17:04:10 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
1fc63da0e5 -s ours
Change-Id: Ib2099e20656223d72578b92a147f6041d5531438
Bill Yi [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Import translations. DO NOT MERGE
am:
7158c89582 -s ours
Change-Id: Ibd294babd698ce66db219d5dd351b157b3158423
Tom O'Neill [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e
am:
d417e54872
Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
Tom O'Neill [Thu, 22 Dec 2016 16:58:33 +0000 (16:58 +0000)]
Fix exploit where can hide the fact that a location was mocked
am:
a206a0f17e
Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
TreeHugger Robot [Thu, 22 Dec 2016 16:57:10 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Calin Juravle [Thu, 22 Dec 2016 16:12:05 +0000 (16:12 +0000)]
Merge "Log DexManager realpath errors only in debug mode."
Calin Juravle [Thu, 22 Dec 2016 14:31:19 +0000 (14:31 +0000)]
Log DexManager realpath errors only in debug mode.
Test: runtest -x .../DexManagerTests.java
Bug:
33807524
Change-Id: I69b7aca347bcd23323a5d72c78edc94a39335d09
TreeHugger Robot [Thu, 22 Dec 2016 12:24:15 +0000 (12:24 +0000)]
Merge "Allowing heads-up notifications now on the lock screen"
TreeHugger Robot [Thu, 22 Dec 2016 10:29:27 +0000 (10:29 +0000)]
Merge "Add DISALLOW_ADD_MANAGED_PROFILE to existing device owners"
TreeHugger Robot [Thu, 22 Dec 2016 09:19:09 +0000 (09:19 +0000)]
Merge "Settings recovery support"
Bill Yi [Thu, 22 Dec 2016 08:31:33 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
45c9ba9c15 -s ours
am:
64a1060855 -s ours
Change-Id: I49ae7611ab760f7c9632f31ceaf57234a06cbf73
Bill Yi [Thu, 22 Dec 2016 08:30:29 +0000 (08:30 +0000)]
Import translations. DO NOT MERGE am:
0277a42568 -s ours
am:
8d8b116bfd -s ours
Change-Id: Ia45d850c2fe20e771a4dcce7429b81b8e643ca8a
Bill Yi [Thu, 22 Dec 2016 08:08:08 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
45c9ba9c15 -s ours
Change-Id: I55a93590829178eaabf1899be1a740c763676c24
Bill Yi [Thu, 22 Dec 2016 08:08:04 +0000 (08:08 +0000)]
Import translations. DO NOT MERGE
am:
0277a42568 -s ours
Change-Id: If66e092903c2f532c4473359e5e792de5a17d327
TreeHugger Robot [Thu, 22 Dec 2016 08:02:47 +0000 (08:02 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 22 Dec 2016 08:01:59 +0000 (08:01 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 22 Dec 2016 08:00:05 +0000 (08:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 22 Dec 2016 07:56:13 +0000 (07:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 22 Dec 2016 05:17:55 +0000 (21:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I86a3a344112aeab07524a48d5946a93ab88954f3
Auto-generated-cl: translation import
Ashutosh Joshi [Thu, 22 Dec 2016 04:36:56 +0000 (04:36 +0000)]
Merge "Move ContextHubService to a better location."
Bill Yi [Thu, 22 Dec 2016 03:50:32 +0000 (19:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id563dc4a6227745978c8999d577b0970c5c1103f
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Dec 2016 03:41:35 +0000 (19:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I292c850e85d1d11be974bc80ddd0ecd7a66ca557
Auto-generated-cl: translation import
Hugo Benichi [Thu, 22 Dec 2016 03:07:19 +0000 (03:07 +0000)]
NetworkNotificationManager: remove spammy log am:
1f0d972efc
am:
f294cdeb27
Change-Id: I2b9b1b52e11ddf784244eedf1311f3b015841215
Hugo Benichi [Thu, 22 Dec 2016 03:02:39 +0000 (03:02 +0000)]
NetworkNotificationManager: remove spammy log
am:
1f0d972efc
Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e
Bill Yi [Thu, 22 Dec 2016 02:49:21 +0000 (18:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic0448c86f29ed5dbd26909f152fb7712da402c57
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Dec 2016 02:26:47 +0000 (18:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8e8050efa30aa198e2a8b1ba30e17d8bbec8a942
Auto-generated-cl: translation import
pkanwar [Sun, 18 Dec 2016 04:16:48 +0000 (20:16 -0800)]
DO NOT MERGE: Add API to indicate carrier networks.
Bug:
31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
TreeHugger Robot [Thu, 22 Dec 2016 01:38:12 +0000 (01:38 +0000)]
Merge "media volume: remove old --set and rename --index to --set"
Svetoslav Ganov [Thu, 22 Dec 2016 01:10:35 +0000 (17:10 -0800)]
Settings recovery support
This change allows the system to perform iterative reset
of changes to settings in order to recover from bad a
state such as a reboot loop.
To enable this we add the notion of a default value. The
default can be set by any package but if the package that
set it is a part of the system, i.e. trusted, then other
packages that are not a part of the system, i.e. untrusted,
cannot change the default. The settings setter APIs that
do not take a default effectively clear the default. Putting
a setting from a system component always makes it the
default and if the package in not trusted then value is
not made the default. The rationale is that the system is
tested and its values are safe but third-party components
are not trusted and their values are not safe.
The reset modes from the least intrusive are: untrusted
defaults - reset only settings set by untrusted components
to their defaults or clear them otherwise; untrusted clear
- clear settings set by untrusted components (or snap to
default if provided by the system); trusted defaults - reset
all settings to defaults set by the system or clear them
otherwise.
Also a package can reset to defaults changes it made to
the global and secure settings. It is also possible to
associate a setting with an optional token which can then
be used to reset settings set by this package and
associated with the token allowing parallel experiments
over disjoint settings subsets.
The default values are also useful for experiment (or
more precisely iterative tuning of devices' behavior in
production) as the stable configuration can be set to
the "graduated" safe defaults and set the values to the
experimental ones to measure impact.
Test: tests pass
Change-Id: I838955ea3bb28337f416ee244dff2fb1199b6943
Hugo Benichi [Thu, 22 Dec 2016 00:49:11 +0000 (09:49 +0900)]
NetworkNotificationManager: remove spammy log
Test: build, flashed, booted phone.
Bug:
32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
TreeHugger Robot [Thu, 22 Dec 2016 00:49:08 +0000 (00:49 +0000)]
Merge "Tighter equals/hashCode method checking."
TreeHugger Robot [Thu, 22 Dec 2016 00:29:21 +0000 (00:29 +0000)]
Merge "Cleanup the evaluateBinding() method."
TreeHugger Robot [Thu, 22 Dec 2016 00:28:19 +0000 (00:28 +0000)]
Merge "Added metrics constant for new dialog"
TreeHugger Robot [Thu, 22 Dec 2016 00:24:19 +0000 (00:24 +0000)]
Merge "Unihiding REFRESH_SUPPORTED and ContentProviderClient#refresh."
TreeHugger Robot [Thu, 22 Dec 2016 00:21:36 +0000 (00:21 +0000)]
Merge "Use a colorspace when decoding to F16"
Frank Barchard [Wed, 21 Dec 2016 02:42:14 +0000 (18:42 -0800)]
media volume: remove old --set and rename --index to --set
The old --set did not take a parameter for volume and was
defaulting to volume index of 5.
The old --index option allowed the user to set the volume to
a specified value.
This CL removes the old --set that had limited usefulness, and
renames --index to --set, so --set now takes a parameter for
volume.
For backward compatibility the --index option is kept around
to allow scripts time to switch to --set
Bug:
33791633
Test: adb shell media volume --set 4
Change-Id: I43a87a878439b3416efa746708b62a869023acdc
Salvador Martinez [Fri, 18 Nov 2016 21:44:57 +0000 (13:44 -0800)]
Added metrics constant for new dialog
SupportSystemInformationDialogFragment (phew)
needs a metrics constant.
Test: manual
Bug:
32462840
Change-Id: I2943b2537a54d3243759233f96522cd1bbdb5db9
Treehugger Robot [Wed, 21 Dec 2016 22:58:40 +0000 (22:58 +0000)]
Merge changes I40f055df,I562713df
* changes:
Stay bound to the most current active scorer.
Clear and restore the calling ID.
Amin Shaikh [Wed, 21 Dec 2016 22:30:32 +0000 (22:30 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi." am:
a93e57f1ac am:
a3943850ab am:
471093b58e
am:
9926363b09 -s ours
Change-Id: I2bb1214df6132f414214241f8e91d9c4b95d7c9a
Adrian Roos [Wed, 21 Dec 2016 22:29:25 +0000 (22:29 +0000)]
Merge "DirectReply: Close if touching outside status bar" into nyc-mr2-dev am:
4869a55f66
am:
cca4e6d093
Change-Id: I7098528a169da5282c78158c336780be7ba0c36c
Adrian Roos [Wed, 21 Dec 2016 22:28:29 +0000 (22:28 +0000)]
DirectReply: Close if touching outside status bar am:
6d53de63bb
am:
e6395f8ac7
Change-Id: Icb978071074bc204365fe7378776ac8377ad02f1
Jeff Sharkey [Wed, 21 Dec 2016 22:27:30 +0000 (22:27 +0000)]
Merge "Reconnect to installd when it restarts." am:
48d5d6cda8 am:
fe35f0f4f6 am:
e286d1b2f8
am:
57c829c291
Change-Id: I6bf169d83de6b9a300f9bb4717660183b1b9e24b
Alan Viverette [Wed, 21 Dec 2016 22:27:28 +0000 (17:27 -0500)]
Add attribute, theme values for error text color
There are currently no clients of this attribute, but that's coming in
a later CL.
Bug:
31440308
Test: n/a theme only
Change-Id: I18a06776d648750638f83ad10566d318d8ef7dd0
Daniel Nishi [Wed, 21 Dec 2016 22:26:32 +0000 (22:26 +0000)]
Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev am:
fbe70a3e93
am:
6c00eb1f31
Change-Id: Ieee5dcff07426c4b55ae33ae8247fd792d622b11
Allen Hair [Wed, 21 Dec 2016 22:25:23 +0000 (22:25 +0000)]
Enable multi-dex for coverage builds to fix breakage am:
77a51d1274
am:
b0d5ade11c -s ours
Change-Id: I6a76bfd6b5924c2adfe3f4ccfe0ea52be7b983b3
TreeHugger Robot [Wed, 21 Dec 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Check if device supports HDMI before getting service"
TreeHugger Robot [Wed, 21 Dec 2016 22:21:13 +0000 (22:21 +0000)]
Merge "Detect non-static abstract inner classes."
Jiaquan He [Wed, 21 Dec 2016 22:13:58 +0000 (22:13 +0000)]
Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev am:
b9606a5d09
am:
5887b6d7b5 -s ours
Change-Id: Ib39e4a7ad8d0bb23d895356628df53ad0ca46c47
Jiaquan He [Wed, 21 Dec 2016 22:12:52 +0000 (22:12 +0000)]
DO NOT MERGE - Disabled swiping in Grid-based Recents. am:
620aebabb2
am:
3785f0a2f6 -s ours
Change-Id: I4ef738ca52e6097cb7bc1cb4e841adfdac1d770f
Calin Juravle [Wed, 21 Dec 2016 22:11:14 +0000 (22:11 +0000)]
Merge "Report non-primary dex files loads to PM" am:
f23ea2ca62 am:
78b3889804 am:
9947e79b26
am:
5be781d874 -s ours
Change-Id: I301ce0b9995086f85f0653c4775a54997419b8fc
TreeHugger Robot [Wed, 21 Dec 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add page view metrics for new paegs in Settings."
TreeHugger Robot [Wed, 21 Dec 2016 21:55:45 +0000 (21:55 +0000)]
Merge "Always create grant structures when persistable."
Jeremy Joslin [Wed, 21 Dec 2016 00:59:26 +0000 (16:59 -0800)]
Stay bound to the most current active scorer.
This fixes the following issue:
1) Scorer A is active and bound.
2) A change occurs to Scorer A such that it is no longer the selected
scorer.
3) Scorer B is selected as the scorer and returned whenever
getActiveScorer() is queried.
4) Scorer A is never unbound because it isn't seen as the active
scorer.
5) Scorer B is never bound until its package changes in some way (or
the feature is disabled/enabled).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest + manual testing.
Change-Id: I40f055df472e2b9e7b07e6979a841dd4c0b794ce
Merged-In: I468a8c02a72f089f1fb778d150d945efe5485b88
Jeremy Joslin [Tue, 20 Dec 2016 22:36:20 +0000 (14:36 -0800)]
Clear and restore the calling ID.
Clear and restore the calling identity in IPC methods after asserting
the caller has the required permissions.
Fixed 2 tests in NetworkScoreServiceTest that were failing due to a
recent refactor.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33781319
Change-Id: I562713df3d9455cdc02bf80a687940fb9daecd8f
Merged-In: Icd79751d12dcfe4af8026980aaa1f7bd463468dc
Jeremy Joslin [Wed, 21 Dec 2016 21:35:02 +0000 (13:35 -0800)]
Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.
Test: build, run.
Change-Id: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
OSDN Git Service
