OSDN Git Service
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"
Sanket Padawe [Tue, 28 Mar 2017 18:30:44 +0000 (11:30 -0700)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
Change-Id: Ic55532c0d8962288346d2c9b067794d7f5c157f3
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
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
Joel Scherpelz [Mon, 27 Mar 2017 05:29:02 +0000 (05:29 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"" am:
63d26caa38
am:
84c2fb2070
Change-Id: I6601d7a30e3eabc3e3929a02f415ba620a2b5c28
Joel Scherpelz [Mon, 27 Mar 2017 05:24:09 +0000 (05:24 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
am:
63d26caa38
Change-Id: I367506eee558dbd7abeeabf09716f7024c2e43d8
Joel Scherpelz [Mon, 27 Mar 2017 05:17:20 +0000 (05:17 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
Joel Scherpelz [Fri, 24 Mar 2017 02:39:14 +0000 (02:39 +0000)]
Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
On second thought, let's set accept_ra_rt_info_m**_plen in
Netd (InterfaceController::initializeAll())
This reverts commit
25870a2c9effd7a7d31c0678c34a6e952b2d56a1.
Change-Id: I22b000623bb852e375385d4aae789d007e84ba3d
puma_hsu [Fri, 24 Mar 2017 02:41:56 +0000 (10:41 +0800)]
Just broadcast intent to bring up MTP/PTP as soon as switching function
Bug:
36113457
Change-Id: I3a7ab6fdcd157740b8e55ded67b3d5dddf15b0e0
Signed-off-by: puma_hsu <puma_hsu@htc.com>
Jakub Pawlowski [Fri, 24 Mar 2017 20:41:51 +0000 (20:41 +0000)]
Merge "Expose connection update callback (4/4)" am:
60865e4a8d
am:
45487910b4
Change-Id: I43cca913c52aac4bd3487f7450ef8167c19db0df
Jakub Pawlowski [Fri, 24 Mar 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Expose connection update callback (4/4)"
am:
60865e4a8d
Change-Id: I0f5301b195b697743d1fb552dac4af8e1fd1445c
Jakub Pawlowski [Fri, 24 Mar 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Expose connection update callback (4/4)"
fionaxu [Fri, 24 Mar 2017 19:20:52 +0000 (12:20 -0700)]
make carrier default app direct boot aware
when device is not ready (based on user state), broadcast will only be
delivered to components which are direct boot aware.
mark default carrier app to be direct boot aware to avoid missing
important redirection signal during booting.
Bug:
34628643
Test: Manaul
Change-Id: I1893f9ffb6e805d1a41704f61fbaa1f16e500e1d
Andrew Solovay [Fri, 24 Mar 2017 18:15:39 +0000 (18:15 +0000)]
docs: Removing Android dev docs from Gerrit am:
ecf817682a am:
d4fdb6e3b2
am:
7ba81a3884
Change-Id: Ibf17dbc51a17e5155bee49024bf6772bcec88967
Andrew Solovay [Fri, 24 Mar 2017 18:12:20 +0000 (18:12 +0000)]
docs: Removing Android dev docs from Gerrit am:
ecf817682a
am:
d4fdb6e3b2
Change-Id: I5fe711e6596afacc4bb363224dcb78057abd99c2
Andrew Solovay [Fri, 24 Mar 2017 18:03:12 +0000 (18:03 +0000)]
docs: Removing Android dev docs from Gerrit
am:
ecf817682a
Change-Id: I0bcc2c8d0b63e73d88187c19ef4addeaed2bfdf0
yinxu [Tue, 14 Mar 2017 22:36:17 +0000 (15:36 -0700)]
Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.
Bug:
36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
Jakub Pawlowski [Fri, 24 Mar 2017 02:05:55 +0000 (19:05 -0700)]
Expose connection update callback (4/4)
Test: manual
Bug:
30622771
Change-Id: I56a3c42814249abc33e95e84ce092c2d8df65434
Jack Yu [Fri, 24 Mar 2017 17:16:46 +0000 (17:16 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei" am:
ad2e7405ad
am:
9b7d3a86bd
Change-Id: I322d40e7696b34ad93781882120352587ff36363
Jack Yu [Fri, 24 Mar 2017 17:10:54 +0000 (17:10 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei"
am:
ad2e7405ad
Change-Id: I4e006290c54a371fc5f080c37f86ca946507d871
Jack Yu [Fri, 24 Mar 2017 17:02:58 +0000 (17:02 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei"
TreeHugger Robot [Fri, 24 Mar 2017 03:21:49 +0000 (03:21 +0000)]
Merge "Cherrypicked from nyc-mr1-dev docs: Removing Android docs from Gerrit Original Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8 Test: make ds-docs" into nyc-mr2-dev-plus-aosp
Julius D'souza [Thu, 23 Mar 2017 23:32:40 +0000 (23:32 +0000)]
Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev am:
e07e8ac99a -s ours
am:
610663ebc5
Change-Id: If3eb5d3b12f4780177aef37e4133338b0d8eb8d2
Julius D'souza [Thu, 23 Mar 2017 23:27:56 +0000 (23:27 +0000)]
Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev
am:
e07e8ac99a -s ours
Change-Id: I65724f0fa8bb9763484f2766c061310d6da06918
Julius D'souza [Thu, 23 Mar 2017 23:15:41 +0000 (23:15 +0000)]
Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev
Android Build Merger (Role) [Thu, 23 Mar 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am:
44ef19d131 am:
aadbb2d45e" into nyc-mr2-dev-plus-aosp
Peter Qiu [Thu, 23 Mar 2017 23:05:29 +0000 (23:05 +0000)]
Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am:
44ef19d131
am:
aadbb2d45e
Change-Id: Ica6e22e24e421cafa50f1c9b9a2483f37459e9d8
Wei Wang [Thu, 23 Mar 2017 23:02:15 +0000 (23:02 +0000)]
Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
am:
7e6dea0fab
Change-Id: Ife3062eddc884dfffccaf7a85ce72dfb5d944882
Peter Qiu [Thu, 23 Mar 2017 23:00:06 +0000 (23:00 +0000)]
Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am:
44ef19d131
Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
Treehugger Robot [Thu, 23 Mar 2017 22:53:46 +0000 (22:53 +0000)]
Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
Jack Yu [Thu, 16 Mar 2017 00:14:01 +0000 (17:14 -0700)]
Deprecated getDeviceId and added getMeid and getImei
Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.
Test: CTS and manual
bug:
34233620,
10831289
Merged-In: Iad4c05d2fd2efc538214f466861497c973882dfe
Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
Brad Ebinger [Thu, 23 Mar 2017 21:28:09 +0000 (21:28 +0000)]
Merge "Notification for MM reject cause code" am:
0805b3486f -s ours
am:
2aee612c14 -s ours
Change-Id: I7cda303ea997223e9ab0564dd5c6be7c5893754b
Wei Wang [Thu, 23 Mar 2017 21:18:45 +0000 (21:18 +0000)]
Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
Brad Ebinger [Thu, 23 Mar 2017 21:17:33 +0000 (21:17 +0000)]
Merge "Notification for MM reject cause code"
am:
0805b3486f -s ours
Change-Id: Ifdd956b77019d2e40fab80fc51d4a7af50e88d98
Brad Ebinger [Thu, 23 Mar 2017 21:04:40 +0000 (21:04 +0000)]
Merge "Notification for MM reject cause code"
Andrew Solovay [Thu, 9 Mar 2017 01:38:01 +0000 (17:38 -0800)]
Cherrypicked from nyc-mr1-dev docs: Removing Android docs from Gerrit
Original Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8
Test: make ds-docs
Android developer docs are now maintained in Piper, go/dac-source
Removing all files from Gerrit, since these files can cause build
errors if they refer to classes that are later removed (whence
bug b/
35849713 ).
Gerrit already has readme files in these directories telling people
docs are not maintained here; these readmes will be a lot easier to
spot now.
Ran a doc build with these files deleted, and it seems to work fine,
so submitting this CL *shouldn't* break anything.
Change-Id: Ic74c3f97f9620daf23543930a8b7ed1386f4d172
Bug:
35849713
Peter Qiu [Thu, 23 Mar 2017 20:12:08 +0000 (20:12 +0000)]
Merge "hotspot2: ignore uninterested headers and content type attributes" am:
7a7bb444cb
am:
10d1deff83
Change-Id: Id8850e9dce3a1c6ee7edfa7730ec8952efe9b3da
Peter Qiu [Thu, 23 Mar 2017 20:06:12 +0000 (20:06 +0000)]
Merge "hotspot2: ignore uninterested headers and content type attributes"
am:
7a7bb444cb
Change-Id: Ic97238b1400e8da514612f983db1896011bf775f
Doris Xi [Mon, 11 Mar 2013 08:03:47 +0000 (17:03 +0900)]
Notification for MM reject cause code
Display notification when UE fails to register network with specific
reject cause code. Define strings for each reject cause code and add
icon to be shown in notification.
Test: manual with simulated RIL
Bug:
28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Treehugger Robot [Thu, 23 Mar 2017 19:53:58 +0000 (19:53 +0000)]
Merge "hotspot2: ignore uninterested headers and content type attributes"
Doris Xi [Thu, 23 Mar 2017 19:36:20 +0000 (19:36 +0000)]
Merge "Notification for MM reject cause code" into stage-aosp-master
am:
9febdd0e9a
Change-Id: I3ee98f4869c8e1dc08d4ca9dd5ea0c81848b2165
TreeHugger Robot [Thu, 23 Mar 2017 19:27:52 +0000 (19:27 +0000)]
Merge "Notification for MM reject cause code" into stage-aosp-master
Peter Qiu [Thu, 16 Mar 2017 18:21:51 +0000 (11:21 -0700)]
wifi: use android.graphics.drawable.Icon for Passpoint icon data
Bug:
35857805
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ib076cd7f565638613173c7373ea5ea61affb876d
Peter Qiu [Tue, 21 Mar 2017 22:25:30 +0000 (15:25 -0700)]
hotspot2: ignore uninterested headers and content type attributes
Each vendor might put additional headers and content type attributes
in the installation file, and will not be useful for us. So just
ignore them when parsing the installation file instead of error out.
While there, add support for parsing "Extension" node in PpsMoParser.
This an interior node containing vendor specific information, only
meaningful to the vendor. So we will ignore fields under this node.
Bug:
36477333
Test: frameworks/base/wifi/tests/runtests.sh
Test: manual test by installing ruckus Passpoint profile
Change-Id: I9954ed000387bc8048d0452a5bfb0f339e676659
Ajay Panicker [Thu, 23 Mar 2017 18:03:42 +0000 (18:03 +0000)]
Merge "AVRCP version interop pereference (3/3)" am:
48ce402668
am:
6e898e8ffd
Change-Id: Ib858c4a4da6515d6d79c54cbd9bdefea2fa09ce1