Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,497 Commits 3 Branches 0 Tags
7d26ab59cddabd6101691739574227e6f052d439
Commit Graph

280497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Joslin
7d26ab59cd Stay bound to the most current active scorer. am: b1365852cc am: d79019a616 
am: 268176317b

Change-Id: I3fcfd02759c9748b4e00a5e825b670259c0d0263
 2016-12-22 19:22:44 +00:00
Jeremy Joslin
7af07643f3 Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c 
am: 3f32d12be0

Change-Id: I2cbf3ca1ff0a743de1b08fad467027ec59333def
 2016-12-22 19:21:45 +00:00
Jeremy Joslin
268176317b Stay bound to the most current active scorer. am: b1365852cc 
am: d79019a616

Change-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483
 2016-12-22 19:11:48 +00:00
Jeremy Joslin
3f32d12be0 Clear and restore the calling ID. am: 29ed4a99bf 
am: 3588b8d44c

Change-Id: I43b6f2899b5d82d4781937766907d6d7afa6b2bd
 2016-12-22 19:10:46 +00:00
Alex Klyubin
a9888fc0c4 resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893 
am: b824658494

Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818
 2016-12-22 19:06:09 +00:00
Jeremy Joslin
d79019a616 Stay bound to the most current active scorer. 
am: b1365852cc

Change-Id: I8313d23450b47f23f73eb050e6b4244bc0d37622
 2016-12-22 19:02:38 +00:00
Jeremy Joslin
3588b8d44c Clear and restore the calling ID. 
am: 29ed4a99bf

Change-Id: Ie5752ca772e6f5c8fed8092d23e0604f44598b24
 2016-12-22 19:01:43 +00:00
Alex Klyubin
b824658494 resolve merge conflicts of febd982 to stage-aosp-master 
am: 5c53fdb893

Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
 2016-12-22 19:01:13 +00:00
Alex Klyubin
5c53fdb893 resolve merge conflicts of febd982 to stage-aosp-master 
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
 2016-12-22 10:20:23 -08:00
Android Build Merger (Role)
52c35fb3a8 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 2016-12-22 18:15:34 +00:00
Tom O'Neill
b14ae0e335 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
 2016-12-22 18:14:47 +00:00
Tom O'Neill
a72e75213f 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
 2016-12-22 18:14:42 +00:00
Tom O'Neill
8dc64b729b 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
 2016-12-22 18:09:50 +00:00
Tom O'Neill
1cc8a2a617 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
 2016-12-22 18:09:48 +00:00
Pankaj Kanwar
b4aa5f6e13 Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev 
am: 683dbf1fc6

Change-Id: If1e5f0f82e18608990500d41211a49e9acbef51f
 2016-12-22 18:04:47 +00:00
Tom O'Neill
f035e8b411 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
 2016-12-22 18:04:44 +00:00
pkanwar
aa4d204be7 DO NOT MERGE: Add API to indicate carrier networks. 
am: 9f47a5d85e

Change-Id: Ib0ed3283a55ec285cafa1f120a8545956e27c242
 2016-12-22 18:04:42 +00:00
Tom O'Neill
3b7d90c024 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
 2016-12-22 17:59:47 +00:00
Pankaj Kanwar
683dbf1fc6 Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev 2016-12-22 17:59:12 +00:00
Tom O'Neill
2da05d0f9e 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
 2016-12-22 17:54:44 +00:00
Tom O'Neill
7cec76de0f 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
 2016-12-22 17:44:46 +00:00
Tom O'Neill
56098f81b6 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
 2016-12-22 17:39:18 +00:00
Tom O'Neill
1ac8affd51 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
 2016-12-22 17:34:11 +00:00
Tom O'Neill
d82f8a67fc 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
 2016-12-22 17:29:05 +00:00
Tom O'Neill
1f458fdc66 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
 2016-12-22 17:23:39 +00:00
Tom O'Neill
d28eef0cc2 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
 2016-12-22 17:19:10 +00:00
Tom O'Neill
1684e5f344 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 
am: 0a8978f04b

Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
 2016-12-22 17:14:05 +00:00
Tom O'Neill
0a8978f04b Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 
am: 3380a77516

Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
 2016-12-22 17:09:09 +00:00
Bill Yi
709844aed4 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 1fc63da0e5  -s ours

Change-Id: Ib2099e20656223d72578b92a147f6041d5531438
 2016-12-22 17:04:10 +00:00
Tom O'Neill
3380a77516 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e 
am: d417e54872

Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
 2016-12-22 17:04:07 +00:00
Bill Yi
f794c86972 Import translations. DO NOT MERGE 
am: 7158c89582  -s ours

Change-Id: Ibd294babd698ce66db219d5dd351b157b3158423
 2016-12-22 17:04:07 +00:00
Tom O'Neill
d417e54872 Fix exploit where can hide the fact that a location was mocked 
am: a206a0f17e

Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
 2016-12-22 16:58:33 +00:00
TreeHugger Robot
1fc63da0e5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2016-12-22 16:57:14 +00:00
Bill Yi
64a1060855 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 45c9ba9c15  -s ours

Change-Id: I55a93590829178eaabf1899be1a740c763676c24
 2016-12-22 08:08:08 +00:00
Bill Yi
8d8b116bfd Import translations. DO NOT MERGE 
am: 0277a42568  -s ours

Change-Id: If66e092903c2f532c4473359e5e792de5a17d327
 2016-12-22 08:08:04 +00:00
TreeHugger Robot
45c9ba9c15 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2016-12-22 08:00:09 +00:00
Bill Yi
7158c89582 Import translations. DO NOT MERGE 
Change-Id: Id563dc4a6227745978c8999d577b0970c5c1103f
Auto-generated-cl: translation import
 2016-12-21 19:50:32 -08:00
Bill Yi
0277a42568 Import translations. DO NOT MERGE 
Change-Id: I292c850e85d1d11be974bc80ddd0ecd7a66ca557
Auto-generated-cl: translation import
 2016-12-21 19:41:35 -08:00
Hugo Benichi
f294cdeb27 NetworkNotificationManager: remove spammy log 
am: 1f0d972efc

Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e
 2016-12-22 03:02:39 +00:00
pkanwar
9f47a5d85e DO NOT MERGE: Add API to indicate carrier networks. 
Bug: 31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
 2016-12-21 17:39:35 -08:00
Hugo Benichi
1f0d972efc NetworkNotificationManager: remove spammy log 
Test: build, flashed, booted phone.
Bug: 32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
 2016-12-22 09:51:01 +09:00
Jeremy Joslin
b1365852cc 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
 2016-12-21 13:44:53 -08:00
Jeremy Joslin
29ed4a99bf 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
 2016-12-21 13:39:10 -08:00
Jeff Sharkey
febd982cdd Merge "Avoid Calendar's unexpect change in snapToCycleDay()" 2016-12-21 21:11:20 +00:00
Amin Shaikh
9926363b09 Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab 
am: 471093b58e

Change-Id: I129d3abd329d9e00de1177ca39cf3ce0ff06946b
 2016-12-21 20:10:30 +00:00
Adrian Roos
cca4e6d093 Merge "DirectReply: Close if touching outside status bar" into nyc-mr2-dev 
am: 4869a55f66

Change-Id: Icab4bdb1181a6b321ba78e954920576d1d79161a
 2016-12-21 20:06:14 +00:00
Adrian Roos
e6395f8ac7 DirectReply: Close if touching outside status bar 
am: 6d53de63bb

Change-Id: I134abad75cae32c8eb9229ac8aa993f9bd71b667
 2016-12-21 20:06:08 +00:00
Amin Shaikh
471093b58e Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac 
am: a3943850ab

Change-Id: Id763d2f82e10dd5843258ef09d0e65824e2c2de6
 2016-12-21 20:02:03 +00:00
Adrian Roos
4869a55f66 Merge "DirectReply: Close if touching outside status bar" into nyc-mr2-dev 2016-12-21 19:56:42 +00:00
Amin Shaikh
a3943850ab Merge "Expose ScanResult#untrusted as a @SystemApi." 
am: a93e57f1ac

Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
 2016-12-21 19:56:19 +00:00