OSDN Git Service
Mukesh Agrawal [Wed, 29 Mar 2017 18:35:37 +0000 (18:35 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3
am:
ad2684ca3d
Change-Id: Ia0d1205b09b4770a4df46604d947c7be7aca8fb5
Jakub Pawlowski [Wed, 29 Mar 2017 18:34:40 +0000 (18:34 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51
am:
eeedda1453
Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250
Tianjie Xu [Wed, 29 Mar 2017 18:30:05 +0000 (18:30 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a
am:
022682a721
Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0
Mukesh Agrawal [Wed, 29 Mar 2017 18:30:00 +0000 (18:30 +0000)]
Merge changes I5c16c650,I3151fb6b
am:
55efea25f3
Change-Id: Ifaaae29780d905ffe9f82645d6d17dad478ba6a9
Jakub Pawlowski [Wed, 29 Mar 2017 18:28:44 +0000 (18:28 +0000)]
Merge "Bluetooth: fix comment wording"
am:
6ba7c54a51
Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
Tianjie Xu [Wed, 29 Mar 2017 18:25:11 +0000 (18:25 +0000)]
Merge "Report the temperature during an OTA update"
am:
47c7e7f41a
Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
Mukesh Agrawal [Wed, 29 Mar 2017 18:20:35 +0000 (18:20 +0000)]
Merge changes I5c16c650,I3151fb6b
* changes:
StateMachine: make toString() terser
utiltests: add script to run tests
Treehugger Robot [Wed, 29 Mar 2017 18:20:22 +0000 (18:20 +0000)]
Merge "Bluetooth: fix comment wording"
Tianjie Xu [Wed, 29 Mar 2017 18:16:44 +0000 (18:16 +0000)]
Merge "Report the temperature during an OTA update"
Etan Cohen [Wed, 29 Mar 2017 17:14:04 +0000 (17:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d
am:
9bc8e05da2
Change-Id: If90e1b691bff1ae6f6a13c59836ad210df38f6d6
Etan Cohen [Wed, 29 Mar 2017 17:08:51 +0000 (17:08 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am:
5d81b9d67d
Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
Etan Cohen [Wed, 29 Mar 2017 17:03:41 +0000 (17:03 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
Jakub Pawlowski [Thu, 23 Mar 2017 05:53:18 +0000 (22:53 -0700)]
Bluetooth: fix comment wording
Test: manual
Bug:
30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
Etan Cohen [Wed, 29 Mar 2017 15:09:28 +0000 (15:09 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b
am:
c24d7f781a
Change-Id: Id3901b3bec685b25297c36d19d9b23a035a00e0c
Etan Cohen [Wed, 29 Mar 2017 15:04:28 +0000 (15:04 +0000)]
Merge "[AWARE] Fix unit tests"
am:
de8e09409b
Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
Etan Cohen [Wed, 29 Mar 2017 14:56:40 +0000 (14:56 +0000)]
Merge "[AWARE] Fix unit tests"
Calin Juravle [Wed, 29 Mar 2017 01:32:10 +0000 (01:32 +0000)]
Merge changes from topic 'dex' am:
f665781c74
am:
8a4afd3dad
Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c
Calin Juravle [Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)]
Merge changes from topic 'dex'
am:
f665781c74
Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
mukesh agrawal [Tue, 28 Mar 2017 03:26:38 +0000 (20:26 -0700)]
StateMachine: make toString() terser
The current implementation of the toString()
method calls dump(). This causes two problems:
1. toString() may return a large string. This
is at odds with the advice in the documentation
for Object.toString(), which says that the
returned String should be concise, and easy
to read.
2. The dump() method is overriden by many of the
StateMachine subclasses. Some of those subclasses
have dump() implementations that are expensive,
and/or have dependencies on other objects.
To resolve these problems, we simpify
StateMachine.toString().
Along the way: remove a stale comment about
implementing dump() using toString().
Note: only ran the StateMachine tests, since some
other tests are already failing.
Bug:
36661851
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I5c16c650f01178c4d018b6a65e4aa95fb905aff6
mukesh agrawal [Wed, 29 Mar 2017 01:19:49 +0000 (18:19 -0700)]
utiltests: add script to run tests
Make it easier to run the tests, so that more people
will run them.
Bug:
36698401
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I3151fb6b2f609f45c7d8154b51f13cce58ccdc13
Calin Juravle [Wed, 29 Mar 2017 01:19:57 +0000 (01:19 +0000)]
Merge changes from topic 'dex'
* changes:
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Register secondary dex files for JIT profiling
Move DexLoadReporter out of LoadedApk
Set pm.BackgroundDexOptService as the source of true
Add missing return in DexManager
Update package use info when the app data is updated
Yifan Hong [Wed, 29 Mar 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da
am:
75172f2909
Change-Id: I173a10744b83e144c19d5fc9167cac40d07aef92
Yifan Hong [Wed, 29 Mar 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
am:
383391c5da
Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1
Treehugger Robot [Wed, 29 Mar 2017 00:32:18 +0000 (00:32 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
Tianjie Xu [Tue, 28 Mar 2017 23:59:16 +0000 (16:59 -0700)]
Report the temperature during an OTA update
Bug:
32518487
Test: mma
Change-Id: I00494aff91b473ae54eff8d56910198f88083d40
Calin Juravle [Fri, 10 Mar 2017 02:41:10 +0000 (18:41 -0800)]
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
a70b1b120365976f5eeb7cb3f577f5f6ff7ad18e)
Merged-In: Iaee8071449c83e774b2fe331aaccfc5433856f4f
Change-Id: I2334e4d73a5acdd1106e913c59ddf642782f1eee
Calin Juravle [Tue, 14 Mar 2017 06:30:30 +0000 (23:30 -0700)]
Register secondary dex files for JIT profiling
Test: boot, and check that profiles get recorded for secondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
f5a7bfc8d5f9e74d6fa1e5be3246e7b4cde65bf6)
Merged-In: I2de23ef44eee3f1783ae698821f1c6d88c66c9a6
Change-Id: Id9bbd630b8485dc17eeef846295458df5cfe446a
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
Brad Ebinger [Tue, 28 Mar 2017 22:40:26 +0000 (22:40 +0000)]
Merge "Remove non-localized message" am:
ddbd256954
am:
70a09c00e5
Change-Id: I19c34a0ee59615ef8bf4d70fbeff993404929a57
Brad Ebinger [Tue, 28 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Remove non-localized message"
am:
ddbd256954
Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
Brad Ebinger [Tue, 28 Mar 2017 22:21:53 +0000 (22:21 +0000)]
Merge "Remove non-localized message"
Andreas Gampe [Tue, 28 Mar 2017 20:44:34 +0000 (20:44 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am:
cbcb388d82
am:
9f6dc54c29
Change-Id: Iaf7619a5161ce336316e9fcd395eabe368ad7302
Andreas Gampe [Tue, 28 Mar 2017 20:38:59 +0000 (20:38 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
am:
cbcb388d82
Change-Id: I5c293bcfb026f75c15fb2fa92b2ac7f796579747
Calin Juravle [Tue, 14 Mar 2017 02:02:32 +0000 (19:02 -0700)]
Move DexLoadReporter out of LoadedApk
The DexLoadReporter was part of LoadedApk in order to lazily initialize
it when the first class loader of the app was created. However there's
no real association between the two and doing the initialization in
LoadedApk buys us nothing.
Extract the reporter in its own class and set it to BaseDexClassLoader
during bindApplication stage.
Test: boot, and check that loaded dex files are reported
Bug:
32871170
Bug:
26719109
(cherry picked from commit
37dfc8ee3ec676a0f059a9f9f1ec5d273e78a502)
Merged-In: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
Change-Id: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
# Conflicts:
# core/java/android/app/LoadedApk.java
Calin Juravle [Thu, 16 Mar 2017 01:38:57 +0000 (18:38 -0700)]
Set pm.BackgroundDexOptService as the source of true
The real dexopt maintainance job is
com.android.server.pm.BackgroundDexOptService, and not
com.android.server.BackgroundDexOptJobService
Partial revert of commit
096d304ae3d85c1bfcda1a1d9cd4eb13d0815500.
Test: manual inspection
Bug:
36140426
(partial cherry picked from commit
91d40f1baa2eeed2aa68d2492e20650d5e71dab5)
Merged-In: I983ac91117f107282095fa7eefdbce08e0dcfce3
Change-Id: I983ac91117f107282095fa7eefdbce08e0dcfce3
# Conflicts:
# core/res/AndroidManifest.xml
#
services/core/java/com/android/server/pm/PackageManagerService.java
# services/java/com/android/server/SystemServer.java
Calin Juravle [Sat, 11 Mar 2017 02:24:33 +0000 (18:24 -0800)]
Add missing return in DexManager
Harmless issue but which can spam the logs.
Test: mostly manual since the check is buried deep inside and cannot be
verified accurately. I added another test to DexManager to stress that
code path and then checked the logs.
Bug:
36117123
(cherry picked from commit
2dfc1b3e125860221bc67835c2d5c99198a12f8a)
Merged-In: I1a878a200f3f726dfaa85f1bed1398acc8dce979
Change-Id: Ib2c034add2e8229b90eb4aaa0067d42d26798670
Calin Juravle [Thu, 23 Feb 2017 03:05:06 +0000 (19:05 -0800)]
Update package use info when the app data is updated
- clear usesByOtherApps flag when the package is updated
- delete secondary dex usage data when the app data is destroyed
Test: runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
Bug:
32871170
Bug:
35381405
(cherry picked from commit
99dd37b3c5262910150ef955d16a33d32da264dd)
Merged-In: I3a249b9e8680e745fa678c7ce61b4ae764078fb9
Change-Id: Ia8416e7232cda3e42a8dccd51cb152a237e0f317
Treehugger Robot [Tue, 28 Mar 2017 20:28:30 +0000 (20:28 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
Jakub Pawlowski [Tue, 28 Mar 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am:
81cef3aeb8
am:
5cca752a4b
Change-Id: I8b16cad8a35aef0be8f69f7ca45d54ff08402930
Jakub Pawlowski [Tue, 28 Mar 2017 20:12:46 +0000 (20:12 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
am:
81cef3aeb8
Change-Id: Ief280cbc9283ff1cabdd3c8e53fcabd47c7881b1
Tianjie Xu [Tue, 28 Mar 2017 20:03:32 +0000 (20:03 +0000)]
Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18
am:
1cd3a93288
Change-Id: I341961293c992b682aea631750eb35ca7857396a
Jakub Pawlowski [Tue, 28 Mar 2017 20:01:30 +0000 (20:01 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
Tianjie Xu [Tue, 28 Mar 2017 19:53:45 +0000 (19:53 +0000)]
Merge "improve the format of locale argument when calling recovery"
am:
032c7a0a18
Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307
Tianjie Xu [Tue, 28 Mar 2017 19:42:53 +0000 (19:42 +0000)]
Merge "improve the format of locale argument when calling recovery"
Jerry Zhang [Tue, 28 Mar 2017 19:07:11 +0000 (19:07 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am:
a0360e38ab
am:
cb6beee2af
Change-Id: I534817c867b9dbd045a491dddcbf8190e299d972
Jerry Zhang [Tue, 28 Mar 2017 18:57:16 +0000 (18:57 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
am:
a0360e38ab
Change-Id: I862f38f52cef8b2b90125953593774263b862306
Sanket Padawe [Tue, 28 Mar 2017 18:43:51 +0000 (18:43 +0000)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
am:
86a70456a6
Change-Id: I74e9ca15db12c11b26a0923fbe2af09de0b6919b
Jerry Zhang [Tue, 28 Mar 2017 18:41:59 +0000 (18:41 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
Andreas Gampe [Tue, 28 Mar 2017 17:59:25 +0000 (10:59 -0700)]
ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.
Bug:
33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
Sanket Padawe [Tue, 28 Mar 2017 18:30:44 +0000 (11:30 -0700)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
Change-Id: Ic55532c0d8962288346d2c9b067794d7f5c157f3
Etan Cohen [Mon, 20 Mar 2017 18:33:12 +0000 (11:33 -0700)]
[AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.
There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).
Bug:
36446307
Test: unit tests and integration (sl4a) tests.
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
Jakub Pawlowski [Thu, 23 Mar 2017 05:44:09 +0000 (22:44 -0700)]
Bluetooth API spelling fixes ("wether" -> "whether")
Bug:
30622771
Test: manual
Change-Id: I01c8b18d0057f2fd6e477ce2ca0b779321b6c0e6
Etan Cohen [Tue, 28 Mar 2017 17:31:47 +0000 (10:31 -0700)]
[AWARE] Fix unit tests
Update to reflect new mockito semantics.
No functional change, no change to test semantics!
Bug:
36680830
Test: unit tests now passing
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Sanket Padawe [Tue, 28 Mar 2017 17:45:37 +0000 (17:45 +0000)]
Merge "String changes for Voice/Data/Emergency service blocked."
Ying Xu [Tue, 28 Mar 2017 17:11:06 +0000 (17:11 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" am:
23393da165
am:
b2558c4ec1
Change-Id: I78639f134a0afb444f71c847d75a470a94a4a1f4
Ying Xu [Tue, 28 Mar 2017 17:04:04 +0000 (17:04 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
am:
23393da165
Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64
Ying Xu [Tue, 28 Mar 2017 16:55:09 +0000 (16:55 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
Robert Greenwalt [Tue, 28 Mar 2017 16:27:36 +0000 (16:27 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" am:
07be9a0ef9
am:
79bde60db2
Change-Id: Ic68d45da8cc06c8cc0bab6d026a497019de74147
Robert Greenwalt [Tue, 28 Mar 2017 16:20:57 +0000 (16:20 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"
am:
07be9a0ef9
Change-Id: I3158ce88ca76a3ad4e8894f514030b31ae40f1fb
Robert Greenwalt [Tue, 28 Mar 2017 16:12:15 +0000 (16:12 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"
Sanket Padawe [Mon, 27 Mar 2017 21:04:42 +0000 (14:04 -0700)]
String changes for Voice/Data/Emergency service blocked.
Bug:
31490566
Change-Id: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
Merged-in: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
Lorenzo Colitti [Tue, 28 Mar 2017 12:41:49 +0000 (12:41 +0000)]
Merge changes If94102c7,I8d51e8e0 am:
22b829c049
am:
0a34afb48d
Change-Id: If6178eebce1d66a8bda36ef20013913013046c7e
Lorenzo Colitti [Tue, 28 Mar 2017 12:33:28 +0000 (12:33 +0000)]
Merge changes If94102c7,I8d51e8e0
am:
22b829c049
Change-Id: I8aa529a05fc40241ec9664775ca0ebd8960098a8
Lorenzo Colitti [Tue, 28 Mar 2017 12:22:42 +0000 (12:22 +0000)]
Merge changes If94102c7,I8d51e8e0
* changes:
Make ConnectivityServiceTest pass on wifi-only devices.
Restore the net.dnsX system properties.
Roshan Pius [Tue, 28 Mar 2017 05:43:28 +0000 (05:43 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call" am:
3777874320
am:
673de5b39d
Change-Id: I11e5afc9813fe629c131936d3587d1d260f3ede8
Roshan Pius [Tue, 28 Mar 2017 05:34:27 +0000 (05:34 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call"
am:
3777874320
Change-Id: Ia12b132ecb8bb8d7effe7b6fa98461c5cbfddf30
Roshan Pius [Tue, 28 Mar 2017 05:25:25 +0000 (05:25 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call"
fen wang [Tue, 28 Mar 2017 05:11:20 +0000 (05:11 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am:
5c64adef5f
am:
40dca362a0
Change-Id: I7b59dc216d893553b146ad6e68f2706255d9f860
fen wang [Tue, 28 Mar 2017 05:03:27 +0000 (05:03 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
am:
5c64adef5f
Change-Id: Iff2e13b8c8921c47176fc43e2a35ebd4cd284a96
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
fen wang [Mon, 13 Mar 2017 10:35:09 +0000 (19:35 +0900)]
Add Bluetooth LDAC ABR UI to the Developer Options
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Lorenzo Colitti [Tue, 21 Mar 2017 09:54:11 +0000 (18:54 +0900)]
Make ConnectivityServiceTest pass on wifi-only devices.
Test: ConnectivityServiceTest passes on ryu on internal master
Test: ConnectivityServiceTest passes on bullhead
Change-Id: If94102c7df0257ea9e69e72b07a685ae3c2c4022
Erik Kline [Tue, 28 Mar 2017 02:34:15 +0000 (02:34 +0000)]
Merge "Add null check to IpManager.dump()" am:
58406d1df2
am:
c5bca697ba
Change-Id: Id5ebbea0c64baa24d162c0545d45915c948f45e6
Erik Kline [Tue, 28 Mar 2017 02:30:18 +0000 (02:30 +0000)]
Merge "Add null check to IpManager.dump()"
am:
58406d1df2
Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
Treehugger Robot [Tue, 28 Mar 2017 02:19:21 +0000 (02:19 +0000)]
Merge "Add null check to IpManager.dump()"
Peter Qiu [Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)]
Merge "hotspot2: register Passpoint related intents as protected broadcast" am:
97bdedf655
am:
61f58f0676
Change-Id: I924befd6d9a1fb1e6bdb257bc6d662172d2354d9
Peter Qiu [Mon, 27 Mar 2017 23:54:37 +0000 (23:54 +0000)]
Merge "hotspot2: register Passpoint related intents as protected broadcast"
am:
97bdedf655
Change-Id: I06d54b99006d631c5792f823e9ae7da1703a201d
Treehugger Robot [Mon, 27 Mar 2017 23:44:42 +0000 (23:44 +0000)]
Merge "hotspot2: register Passpoint related intents as protected broadcast"
Robert Greenwalt [Fri, 24 Mar 2017 18:55:47 +0000 (11:55 -0700)]
Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent. Changed to use com.android.internal.* namespace.
bug:
35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
Peter Qiu [Mon, 27 Mar 2017 18:49:33 +0000 (11:49 -0700)]
hotspot2: register Passpoint related intents as protected broadcast
These intents should only be broadcast by the System Service, so
register them as protected broadcast.
Bug:
36655814
Test: Build with go/aog/355397, verify in logcat that no non-protected
broadcast error gets thrown when
android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST intent
is broadcasted
Change-Id: I57849d0decef407624cac380a0f12f5428e0f1de
Lorenzo Colitti [Fri, 6 Jan 2017 01:25:02 +0000 (10:25 +0900)]
Restore the net.dnsX system properties.
In order to avoid app breakage, we are putting back the system
properties and using selinux to disallow access from apps
targeting the O SDK or above.
This CL is cherry-picked from internal commit
e3b85dfbc1dde8d229410f54c75c1efa4bb09fbe, but with a different
commit description.
Bug:
33308258
Bug:
33807046
Bug:
34028616
Bug:
34115651
Test: system properties are readable as root and shell
Change-Id: I8d51e8e0a620d581c4251fb2f3c1d0a813b929be
Peter Qiu [Mon, 27 Mar 2017 21:33:46 +0000 (21:33 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am:
ae3bae715e
am:
78eeb9b090
Change-Id: Icf369fc41387dbd1ed854434f2d77ecd867c4532
Peter Qiu [Mon, 27 Mar 2017 21:29:53 +0000 (21:29 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am:
ae3bae715e
Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd
Jakub Pawlowski [Mon, 27 Mar 2017 21:27:25 +0000 (21:27 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am:
beb8ceada8
am:
cfe099b01d
Change-Id: I7dda88f7c2c26cbb3ae192f313dcc4bd15afd6d6
Jakub Pawlowski [Mon, 27 Mar 2017 21:22:15 +0000 (21:22 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
am:
beb8ceada8
Change-Id: Ie88e330a1d50adac8c6b83581079c6096c4d898a
Peter Qiu [Mon, 27 Mar 2017 21:21:41 +0000 (21:21 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
Jakub Pawlowski [Mon, 27 Mar 2017 21:15:20 +0000 (21:15 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
Chen Xu [Mon, 27 Mar 2017 21:00:25 +0000 (21:00 +0000)]
Merge "make carrier default app direct boot aware" am:
98ded6c9ab
am:
3f26682252
Change-Id: Ic58ee1d881a85622ce03cc7ccbba1b2e274e8760
Peter Qiu [Mon, 27 Mar 2017 20:45:25 +0000 (13:45 -0700)]
wifi: catch UnsupportedOperationException for getMatchingWifiConfig
On a device without Passpoint support, an UnsupportedOperationException
will be thrown when invoking WifiManager#getMatchingWifiConfig.
So catch it to avoid crash.
Bug:
36649203
Test: manually set config_wifi_hotspot2_enabled to false and verify
Settings app doesn't crash
Change-Id: I69f37897449033da9d21edda9953ad2738f7e314
Chen Xu [Mon, 27 Mar 2017 20:54:53 +0000 (20:54 +0000)]
Merge "make carrier default app direct boot aware"
am:
98ded6c9ab
Change-Id: I6a8f45b2839a07a9bfae23ab41a9c6ebd1c0e5e1
Chen Xu [Mon, 27 Mar 2017 20:45:13 +0000 (20:45 +0000)]
Merge "make carrier default app direct boot aware"
Erik Kline [Mon, 27 Mar 2017 20:28:02 +0000 (05:28 +0900)]
Add null check to IpManager.dump()
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
36650508
Change-Id: I2270bec20b966de487048f0ea0c97360e242cd9d
Jakub Pawlowski [Mon, 27 Mar 2017 19:14:40 +0000 (12:14 -0700)]
Bluetooth GATT callback naming fix "Ext" -> "" (1/2)
Gatt callback don't need the "Ext" postfix, as it was removed from new
API.
Test: manual
Bug:
30622771
Change-Id: I54596ffdcb818343cc313123266cfa16291c6236
Lorenzo Colitti [Mon, 27 Mar 2017 19:21:19 +0000 (19:21 +0000)]
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am:
a1e206a335
am:
37afaac70d
Change-Id: Id576f61f3ac7d1de828c870ffaf4d6ab3e1e2568
Lorenzo Colitti [Mon, 27 Mar 2017 19:16:17 +0000 (19:16 +0000)]
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
am:
a1e206a335
Change-Id: I71fabdff9deb0f7ba40a545090bd09ddc66994a8
Lorenzo Colitti [Mon, 27 Mar 2017 19:08:24 +0000 (19:08 +0000)]
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
Neil Fuller [Mon, 27 Mar 2017 14:17:33 +0000 (14:17 +0000)]
Merge "Update settings to use latest IDs for zones" am:
c75dbe9d9c
am:
0f3235a167
Change-Id: I0a7c8e33d84995b36793b2ed3485f985bc251bc5
Neil Fuller [Mon, 27 Mar 2017 14:12:35 +0000 (14:12 +0000)]
Merge "Update settings to use latest IDs for zones"
am:
c75dbe9d9c
Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1
Treehugger Robot [Mon, 27 Mar 2017 14:06:34 +0000 (14:06 +0000)]
Merge "Update settings to use latest IDs for zones"
Neil Fuller [Thu, 23 Mar 2017 14:46:52 +0000 (14:46 +0000)]
Update settings to use latest IDs for zones
Various zones in timezones.xml were being identified by old
IDs. The settings picker and setup wizard uses the exact
ID when pre-selecting the user's current zone. Since the
autodetection uses the new IDs in places like Buenos
Aires users would not have the correct zone pre-selected
during setup.
Thanks to Marcio Ikeda of LG for the report.
Other legacy IDs found with:
for TZ in `grep 'id=' timezones.xml \
| awk -F\" '{ print $2 }'`; do \
grep ${TZ} ~/Downloads/tzdata2016g/zone.tab > /dev/null; \
if (( $? != 0 )); then echo Bad: ${TZ}; fi; \
done
New IDs found using tzdata NEWS and "backward" file.
Test: Manual testing: selection of the zone in the settings
Bug:
36469833
(cherry picked from commit
b4d003da66beb414e8e7fcec94a82a53027dbbfa)
Merged-In: I8c20494a48870cdc600854756061e86db730e14a
Change-Id: I829a70921eb13b763b5446820c87672615f2524d