OSDN Git Service
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"
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
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: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)"
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"
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: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: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: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
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
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: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"
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: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"
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"
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 17:57:38 +0000 (17:57 +0000)]
Merge "AVRCP version interop pereference (3/3)"
am:
48ce402668
Change-Id: Ia49ab34142e5e26f886b07f2e17575e81c9dfd0d
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (3/3)"
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
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Przemyslaw Szczepaniak [Thu, 23 Mar 2017 16:31:28 +0000 (16:31 +0000)]
Merge "Track libcore commit
a2d9879b"
am:
4aa106a790
Change-Id: I447493da10ec6e42b9b8fcc379ddae578ee78e91
Treehugger Robot [Thu, 23 Mar 2017 16:20:24 +0000 (16:20 +0000)]
Merge "Track libcore commit
a2d9879b"
Alan Viverette [Thu, 23 Mar 2017 14:25:07 +0000 (14:25 +0000)]
Merge "Skip ListPopupWindow position update if detached"
am:
c45b10a9cb
Change-Id: I85f5250d4b37b771ff4d39d80082e8355154ed57
Przemyslaw Szczepaniak [Thu, 23 Mar 2017 14:23:53 +0000 (14:23 +0000)]
Merge "Default 'persist.sys.timezone' property to GMT if not set on init."
am:
302b7a7075
Change-Id: I3eba21ec64878deda2d3465fcac96384241f27aa
Alan Viverette [Thu, 23 Mar 2017 14:17:28 +0000 (14:17 +0000)]
Merge "Skip ListPopupWindow position update if detached"
Treehugger Robot [Thu, 23 Mar 2017 14:14:19 +0000 (14:14 +0000)]
Merge "Default 'persist.sys.timezone' property to GMT if not set on init."
Lorenzo Colitti [Wed, 22 Mar 2017 02:19:26 +0000 (11:19 +0900)]
Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi.
Fix:
34721574
Test: builds, apicheck passes
Change-Id: If921f265c02ffb57d5ac717f924f91f664dd991f
Jakub Pawlowski [Thu, 23 Mar 2017 01:25:31 +0000 (01:25 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)"
am:
fa69eeac5c
Change-Id: Ia09cf5db2f69659a3b77e4c5e663d5977793df48
Jakub Pawlowski [Thu, 23 Mar 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)"
Adam Lesinski [Thu, 23 Mar 2017 00:48:31 +0000 (00:48 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
am:
0aae170841
Change-Id: I8363aab4dbf0690b92988353d9360c713412a0be
Sanket Padawe [Thu, 23 Mar 2017 00:45:37 +0000 (00:45 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
am:
1df4c1ae54
Change-Id: I9233a85edb9321faaeb3f7813d4020159e52b691
Jakub Pawlowski [Thu, 23 Mar 2017 00:44:06 +0000 (00:44 +0000)]
Merge "BluetoothGattCallbackExt removal"
am:
e2ddacaff4
Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661
Marie Janssen [Thu, 23 Mar 2017 00:42:53 +0000 (00:42 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts"
am:
25b6f08ece
Change-Id: I1a0bfa2c8aba75dd60437680c5726f8c4e6c88ab
Treehugger Robot [Wed, 22 Mar 2017 23:53:59 +0000 (23:53 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
Jakub Pawlowski [Wed, 22 Mar 2017 22:40:21 +0000 (15:40 -0700)]
Bluetooth 5 Enable->Enabled (1/2)
Test: manual
Bug:
30622771
Change-Id: I37b198927076a0267de67e1bd94eaea9e88e53bb
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
Ajay Panicker [Mon, 20 Mar 2017 21:20:52 +0000 (14:20 -0700)]
AVRCP version interop pereference (3/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Merged-In: Ibc271063058b6324b1a0517c6b853f8d7e6eb0f3
Change-Id: Ibc271063058b6324b1a0517c6b853f8d7e6eb0f3
Jakub Pawlowski [Wed, 22 Mar 2017 20:09:37 +0000 (20:09 +0000)]
Merge "BluetoothGattCallbackExt removal"
Adam Lesinski [Wed, 22 Mar 2017 19:31:52 +0000 (19:31 +0000)]
Update IBatteryPropertiesRegistrar.aidl to support force updates
Change-Id: Ic4f705a20db32369d106462c47eb150850a3f638
Test: builds
Ajay Panicker [Wed, 22 Feb 2017 20:23:15 +0000 (12:23 -0800)]
Bluetooth: Use content observer for airplane mode
We are making this switch as the airplane mode switch intent is going away.
Fix:
35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05
Jakub Pawlowski [Wed, 22 Mar 2017 18:22:18 +0000 (11:22 -0700)]
BluetoothGattCallbackExt removal
New methods should be added to BluetoothGattCallback, instead of
creating Ext class.
Test: manual
Bug:
30622771
Change-Id: I2567df5baace6bd2d2f30c36d2f62056408ca5d0
Przemyslaw Szczepaniak [Wed, 22 Mar 2017 15:13:17 +0000 (15:13 +0000)]
Default 'persist.sys.timezone' property to GMT if not set on init.
Test: make, flashall -w and tested persist.sys.timezone value
Bug:
36488101
Change-Id: I6d0dab1e247dd7c303153bbe0e997581e36a973d
Treehugger Robot [Wed, 22 Mar 2017 16:09:03 +0000 (16:09 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts"
Daichi Hirono [Wed, 22 Mar 2017 07:55:57 +0000 (07:55 +0000)]
Merge "Stop holding mProxyLock while downloading PAC script data."
am:
7b26041ccc
Change-Id: Ie747a28fe588c15789d965d6274cb717ea9a5fb0
Treehugger Robot [Wed, 22 Mar 2017 07:47:19 +0000 (07:47 +0000)]
Merge "Stop holding mProxyLock while downloading PAC script data."
Daichi Hirono [Fri, 17 Mar 2017 00:12:12 +0000 (09:12 +0900)]
Stop holding mProxyLock while downloading PAC script data.
Holding PacManager#mProxyLock for long time eventually causes ANR when
launching new applications.
1. ActivityThread#handleBindApplication blocks until
ActivityThread#handleBindApplication
-> ConnectivityService#getProxyForNetwork()
-> ConnectivityService#getDefaultProxy()
obtains the lock of ConnectivityService#mProxyLock
2. ConnectivityService#mProxyLock can be held by
ConnectivityService#setGlobalProxy() running on another thread until
ConnectivityService#setGlobalProxy()
-> ConnectivityService#sendProxyBroadcast()
-> PacManager#setCurrentProxyScriptUrl()
obtains the lock of PacManager#mProxyLock
3. Before the CL, PacManager#mProxyLock could be held by
mPacDownloader#run() on mNetThread until downloading a PAC script
completed.
The CL fixes the step 3 so that mPacDownloader#run does not keep the
lock of PacManager#mProxyLock. It eventually fixes long blocking at
ActivityThread#handleBindApplication and ANR when launching an
application.
Bug:
36317236
Test: Build succeeded
Merged-In: I864e41e1142178681f8f1b4fb7750d37e3ab2076
Change-Id: I864e41e1142178681f8f1b4fb7750d37e3ab2076
Yunlian Jiang [Wed, 22 Mar 2017 00:21:57 +0000 (00:21 +0000)]
Merge "Fix warning: Potential leak of memory pointed to by 'set'"
am:
58ba53bd53
Change-Id: I7186dc35fb7f4a3c226e35447ce9c748164e7bf8
Treehugger Robot [Wed, 22 Mar 2017 00:17:32 +0000 (00:17 +0000)]
Merge "Fix warning: Potential leak of memory pointed to by 'set'"
Sanket Padawe [Sat, 11 Mar 2017 00:18:20 +0000 (16:18 -0800)]
Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis.
Bug:
35767068
Test: No build failure.
Change-Id: I3b15901ff18742b5e99f03e74a6412d352461458
Merged-in: I3b15901ff18742b5e99f03e74a6412d352461458
Wei Wang [Tue, 21 Mar 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Remove bg_non_interactive cgroup"
am:
c6c19bd6c0
Change-Id: I35917ee0c52720138c901fd638e07f84ae4c3cf3
Treehugger Robot [Tue, 21 Mar 2017 22:09:50 +0000 (22:09 +0000)]
Merge "Remove bg_non_interactive cgroup"
Andreas Gampe [Tue, 21 Mar 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
am:
1ae7af10ff
Change-Id: Ia1ffb03d6e03b098cc634ef2deb3785c6bb87202
Andreas Gampe [Tue, 21 Mar 2017 18:45:00 +0000 (18:45 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
Jakub Pawlowski [Tue, 21 Mar 2017 18:44:36 +0000 (18:44 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
am:
7f14b8f095
Change-Id: I26846383be5c0fe88501ffd1011b27f39896a74a
Jakub Pawlowski [Tue, 21 Mar 2017 18:43:21 +0000 (18:43 +0000)]
Merge "Add missing txPower parameter"
am:
a6c1f6def1
Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a
Marie Janssen [Fri, 17 Mar 2017 01:10:59 +0000 (18:10 -0700)]
Bluetooth: log unexpected crashes and restarts
Add some reasons to the log when:
- the Bluetooth stack crashes underneath us
- user switches
- we automatically restart
List every instance of the stack crashing underneath us in the dumpsys.
Clean up some unused constants.
Test: notice a Bluetooth crash, adb bugreport
Change-Id: I79195f0a574de1bf48a976d31c64084d3ce2e14a
Jakub Pawlowski [Tue, 21 Mar 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
Jakub Pawlowski [Mon, 20 Mar 2017 22:57:46 +0000 (15:57 -0700)]
Add setScannable to AdvertisingSetParameters (1/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.
Test: manual
Bug:
30622771
Change-Id: Ie520609d3fff07ccc2960015c19311d773842852
Jakub Pawlowski [Tue, 21 Mar 2017 18:36:14 +0000 (18:36 +0000)]
Merge "Add missing txPower parameter"
Jakub Pawlowski [Tue, 21 Mar 2017 00:02:20 +0000 (17:02 -0700)]
Add missing txPower parameter
Test: manual
Bug:
30622771
Change-Id: Iaf3111d7545f9bb046b5a23b680347a75125ca7e
Joachim Sauer [Tue, 21 Mar 2017 18:22:44 +0000 (18:22 +0000)]
Merge "Update to 2017a."
am:
2ca0abc8de
Change-Id: I0a6dd7f5cef6f7f3634413d012c8f1c84c807aac
Treehugger Robot [Tue, 21 Mar 2017 18:09:33 +0000 (18:09 +0000)]
Merge "Update to 2017a."
Przemyslaw Szczepaniak [Tue, 21 Mar 2017 13:57:19 +0000 (13:57 +0000)]
Track libcore commit
a2d9879b
Test: make -j 32
Bug:
36461944
Change-Id: I0cf924a0f07d3d048f75edb4061b20f065ba80b1
Andreas Gampe [Mon, 13 Mar 2017 21:36:09 +0000 (14:36 -0700)]
Zygote: Preserve capabilities in WrapperInit
Preserve the capabilities a zygote fork has across the sh exec in
WrapperInit. Use ambient capabilities.
Test: m
Test: adb shell setprop wrap.com.android.bluetooth logwrapper && adb shell kill `pid com.android.bluetooth`
Merged-In: I3526d6a31aaadf082365c9ce31da0950e17677eb
Change-Id: I3526d6a31aaadf082365c9ce31da0950e17677eb
Joachim Sauer [Tue, 21 Mar 2017 12:39:26 +0000 (12:39 +0000)]
Update to 2017a.
This commit adds America/Punta_Arenas to time_zones_by_country.xml to
allow it to automatically be picked based on cell network information.
Bug:
35861784
Test: builds & boots & automatic timezone detection still works
Change-Id: I1bfa327fbb58f82eb951028e288fad819bf0f231
Erik Kline [Tue, 21 Mar 2017 10:14:19 +0000 (10:14 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
am:
9eb959320f
Change-Id: I29c80b36ddd14e1e03c88c63d35ee9982dcef887
Treehugger Robot [Tue, 21 Mar 2017 10:05:41 +0000 (10:05 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
Jack Yu [Tue, 21 Mar 2017 09:20:17 +0000 (09:20 +0000)]
Merge "Added ETWS primary message default message support"
am:
2d3fb48b39
Change-Id: Ib03378e2f9c2da53b5efbedde08b20acc0b8c199
Treehugger Robot [Tue, 21 Mar 2017 09:11:44 +0000 (09:11 +0000)]
Merge "Added ETWS primary message default message support"
Jack Yu [Sat, 18 Mar 2017 06:21:48 +0000 (23:21 -0700)]
Added ETWS primary message default message support
ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.
Test: manual
bug:
33595007
Merged-In: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup
Bug:
34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5
Jeremy Klein [Mon, 20 Mar 2017 23:58:09 +0000 (23:58 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
am:
4a8953094f
Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
Jeremy Klein [Mon, 20 Mar 2017 23:50:57 +0000 (23:50 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
Jakub Pawlowski [Mon, 20 Mar 2017 22:26:42 +0000 (22:26 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am:
f0c963a5b6
Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
Jakub Pawlowski [Mon, 20 Mar 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Jeremy Klein [Fri, 17 Mar 2017 21:30:02 +0000 (14:30 -0700)]
In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.
Bug:
32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b
Jerry Zhang [Mon, 20 Mar 2017 21:39:17 +0000 (21:39 +0000)]
Merge "Add support for MTP perceived device type property."
am:
b6ed343e85
Change-Id: I58417625aa6c669eb82af3a11a4e35c77952f539
Treehugger Robot [Mon, 20 Mar 2017 21:23:10 +0000 (21:23 +0000)]
Merge "Add support for MTP perceived device type property."
Jakub Pawlowski [Fri, 17 Mar 2017 22:33:27 +0000 (15:33 -0700)]
Bluetooth 5 AdvertisingSet implementation (1/4)
Test: manual
Bug:
30622771
Change-Id: Ia89718c0c2ab2eaa71b158ecdcae989af907769f
Su, Weihua [Mon, 20 Mar 2017 17:12:40 +0000 (17:12 +0000)]
Merge "Fix crash issue on Storage Manager app"
am:
cb4a3c55cf
Change-Id: If33e23972770c50cf83a42d8621d31b15b945524
Treehugger Robot [Mon, 20 Mar 2017 17:05:18 +0000 (17:05 +0000)]
Merge "Fix crash issue on Storage Manager app"