Commit Graph

22285 Commits

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
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
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
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
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
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
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
Hugo Benichi
f294cdeb27 NetworkNotificationManager: remove spammy log
am: 1f0d972efc

Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e
2016-12-22 03:02:39 +00: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
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
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
Amin Shaikh
a3943850ab Merge "Expose ScanResult#untrusted as a @SystemApi."
am: a93e57f1ac

Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
2016-12-21 19:56:19 +00:00
Amin Shaikh
3d18c621cb Expose ScanResult#untrusted as a @SystemApi.
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
Merged-In: If7006040f63843c1c468c9d95c5c017383c5c5dd
2016-12-21 11:46:22 -08:00
Jeff Sharkey
57c829c291 Merge "Reconnect to installd when it restarts." am: 48d5d6cda8 am: fe35f0f4f6
am: e286d1b2f8

Change-Id: Ib7ff45fee2865a28e7cb138d9fd418d7a3e50c94
2016-12-21 19:06:21 +00:00
Jeff Sharkey
e286d1b2f8 Merge "Reconnect to installd when it restarts." am: 48d5d6cda8
am: fe35f0f4f6

Change-Id: I63a78822f4a4c3c4d6e71af721c7a31a5bdba03a
2016-12-21 19:01:55 +00:00
Jeff Sharkey
fe35f0f4f6 Merge "Reconnect to installd when it restarts."
am: 48d5d6cda8

Change-Id: Ib4c4ced58f5963465f1e2d3eb401a8c71624ac12
2016-12-21 18:56:47 +00:00
Jeff Sharkey
9f2f2183fc Reconnect to installd when it restarts.
Test: builds, boots, reconnects when installd dies
Bug: 33695164
Change-Id: I29769a111783095f742ad81af779a7403ca52ff3
2016-12-21 09:19:08 -07:00
Calin Juravle
5be781d874 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 am: 78b3889804
am: 9947e79b26

Change-Id: I8ddb7756c0690584343cb026a298bc5f0b8d4e27
2016-12-21 10:14:42 +00:00
Calin Juravle
9947e79b26 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62
am: 78b3889804

Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
2016-12-21 10:09:45 +00:00
Calin Juravle
78b3889804 Merge "Report non-primary dex files loads to PM"
am: f23ea2ca62

Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
2016-12-21 10:04:39 +00:00
Calin Juravle
f23ea2ca62 Merge "Report non-primary dex files loads to PM" 2016-12-21 09:57:41 +00:00
Daniel Nishi
f1312cd68e Augment diskstats dumpsys to have categorization and apps.
am: 090b2d9d6c

Change-Id: I2c923293a1baf91b14ab50e25c880bfeb191403d
2016-12-21 02:23:50 +00:00
Daniel Nishi
a9d8602787 Add a file collector to the platform.
am: be770dce08

Change-Id: I2b908b6df1ad305207fca596d6c865dfeaecd5c9
2016-12-21 02:23:05 +00:00
Daniel Nishi
f5e2f1ae38 Add an app size collector.
am: c7d9de59bf

Change-Id: I83bdc3b47eda2658d7467b7c298652e39ad3f238
2016-12-21 02:21:31 +00:00
TreeHugger Robot
639f95dd13 Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
* changes:
  Augment diskstats dumpsys to have categorization and apps.
  Add a file collector to the platform.
2016-12-21 02:14:54 +00:00
TreeHugger Robot
8fd55702b1 Merge "Add an app size collector." into nyc-mr2-dev 2016-12-21 02:14:54 +00:00
Andre Eisenbach
891a513e01 Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
am: bf43955a6b

Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346
2016-12-20 21:35:03 +00:00
Daniel Nishi
090b2d9d6c Augment diskstats dumpsys to have categorization and apps.
This adds a new service which opportunistically saves the
file system categorization information and the app sizes. This
information is fetched during a diskstats dumpsys call from a file
stored on the disk. This allows us to keep the dumpsys running quickly
while adding information which is costly to calculate.

Bug: 32207207
Test: System server instrumentation tests
Change-Id: Id59e84b9ad38a9debf3e46e5133ef06f7353829d
2016-12-20 13:32:51 -08:00
Daniel Nishi
c7d9de59bf Add an app size collector.
The app collector gets a list of app sizes for packages on a given
storage volume. This information will be exposed as part of an
expansion of the diskstats dumpsys.

When the collector runs, it sets up a handler on a BackgroundThread
which asks the PackageManager for the package sizes for all apps and
all users. The call for the information is blocked using a
CompletableFuture until the call times out or until we've received
all of the package stats. After the stats are all obtained, the
future completes.

Bug: 32207207
Test: System server instrumentation tests
Change-Id: I3a27dc4410effb12ae33894b561c02a60322f7b0
2016-12-20 13:28:14 -08:00
Andre Eisenbach
bf43955a6b Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
am: e6164ca72a

Change-Id: I7c27d09c83daf73817585f2713bd2f05b97cd525
2016-12-20 21:27:05 +00:00
Daniel Nishi
be770dce08 Add a file collector to the platform.
The file collector takes in a file path and recursively
classifies and provides the amount of storage provided by
each classification. This information can be surfaced in
Settings or to fulfill storage telemetry calculations.

Bug: 32207207
Test: System server instrumentation tests
Change-Id: Iff03260859cd4bbd11e7d60b1825115aad540d48
2016-12-20 13:24:14 -08:00
Andre Eisenbach
e6164ca72a Merge "Bluetooth: persist state when turning on from BLE"
am: 8e9551bacf

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010
2016-12-20 21:18:35 +00:00
Marie Janssen
e0bfa2efa2 Bluetooth: persist state when turning on from BLE
Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310
2016-12-20 21:11:35 +00:00
Marie Janssen
fa9bec95a5 Bluetooth: persist state when turning on from BLE
Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310
2016-12-20 13:09:47 -08:00
Tony Mak
83dcc26065 DO NOT MERGE: Cross profile candidate should be considered
am: ff11122ddc

Change-Id: I9de28d980021579d70d85193b1994ddca042d4fa
2016-12-20 16:57:44 +00:00