OSDN Git Service
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
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)"
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
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
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:37:52 +0000 (16:37 +0000)]
Merge "Track libcore commit
a2d9879b" am:
4aa106a790
am:
b89ec268ab
Change-Id: I0649915b7efcbfa2c14b68d16c4d0de71656d694
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:30:23 +0000 (14:30 +0000)]
Merge "Skip ListPopupWindow position update if detached" am:
c45b10a9cb
am:
3107a17ba7
Change-Id: I9f2f95841e32aa49e4cb80fa57d34f55594931b3
Przemyslaw Szczepaniak [Thu, 23 Mar 2017 14:29:17 +0000 (14:29 +0000)]
Merge "Default 'persist.sys.timezone' property to GMT if not set on init." am:
302b7a7075
am:
2f5a9febf4
Change-Id: I43c05ca3f139fce4e08c7c40cc3823821341d176
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
Julius D'souza [Wed, 22 Mar 2017 18:55:58 +0000 (11:55 -0700)]
DO NOT MERGE: Add state machine model for skipping initial brightness ramps.
Bug:
36092576
Change-Id: Ic403ab587c3f4cb707e8316c6107461bf0748a1c
Jakub Pawlowski [Thu, 23 Mar 2017 01:29:27 +0000 (01:29 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)" am:
fa69eeac5c
am:
cde107da6c
Change-Id: Id8151bf6c58a384b5ca264faae71b601a9dcfc63
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 01:02:56 +0000 (01:02 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates" am:
0aae170841
am:
e4d926d9af
Change-Id: Ie8e717f2c5ca38e57d269d9d4d44599b897fb855
Sanket Padawe [Thu, 23 Mar 2017 00:57:56 +0000 (00:57 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am:
1df4c1ae54
am:
bdee77da38
Change-Id: Ie01e7db8f2c5eb4552db0ff7416998b67d70a501
Jakub Pawlowski [Thu, 23 Mar 2017 00:53:41 +0000 (00:53 +0000)]
Merge "BluetoothGattCallbackExt removal" am:
e2ddacaff4
am:
2a32d04a24
Change-Id: Id25f495acb6864b1416a2730b5396be99105e43d
Marie Janssen [Thu, 23 Mar 2017 00:52:33 +0000 (00:52 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts" am:
25b6f08ece
am:
3d4c1fd1fb
Change-Id: I423f7fb78ffdb2b72a1db780abf9119e6718c8ad
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
Ajay Panicker [Thu, 23 Mar 2017 00:47:22 +0000 (00:47 +0000)]
Bluetooth: Use content observer for airplane mode
am:
400279def2
Change-Id: I16d88bbe5e0326223b74903804ee1f40d367035d
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"
Andrew Solovay [Thu, 9 Mar 2017 01:38:01 +0000 (17:38 -0800)]
docs: Removing Android dev docs from Gerrit
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.
Merged to master to resolve conflict.
Merged-In: Ic74c3f97f9620daf23543930a8b7ed1386f4d172
Bug:
35849713
Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8
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:59:54 +0000 (07:59 +0000)]
Merge "Stop holding mProxyLock while downloading PAC script data." am:
7b26041ccc
am:
42d6843aa4
Change-Id: Idc1b507555415d467669c7e1d1c9035b449de763
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:26:09 +0000 (00:26 +0000)]
Merge "Fix warning: Potential leak of memory pointed to by 'set'" am:
58ba53bd53
am:
0889a8a070
Change-Id: I8672f532a2ab43275a9204fe732b6b6ba1604388
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'"
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Bug:
34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5
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:26:32 +0000 (22:26 +0000)]
Merge "Remove bg_non_interactive cgroup" am:
c6c19bd6c0
am:
4ff81206e0
Change-Id: Ie79e352a5cf60af7f1bce8ae3563bf66ee1db134
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"
Calvin On [Tue, 21 Mar 2017 20:28:22 +0000 (20:28 +0000)]
Remove the now-empty WearBluetoothService from SystemServer am:
3bcc688bce
am:
9a80c1799c
Change-Id: I5d6bff145f0f77b75184dd9e794130ff70509b58
Calvin On [Tue, 21 Mar 2017 20:18:59 +0000 (20:18 +0000)]
Remove the now-empty WearBluetoothService from SystemServer
am:
3bcc688bce
Change-Id: Id95770faa65878282d9b49c01fad258b8eb57c06
Andreas Gampe [Tue, 21 Mar 2017 18:58:27 +0000 (18:58 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit" am:
1ae7af10ff
am:
1d9c3ba10d
Change-Id: Ia9b6111705486d7da69ef2436d03cd19272502b6
Andreas Gampe [Tue, 21 Mar 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
am:
1ae7af10ff
Change-Id: Ia1ffb03d6e03b098cc634ef2deb3785c6bb87202
Jakub Pawlowski [Tue, 21 Mar 2017 18:52:03 +0000 (18:52 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)" am:
7f14b8f095
am:
8d06b41826
Change-Id: I8cc220bd494841841f89eeba840ce71b1c2a0692
Jakub Pawlowski [Tue, 21 Mar 2017 18:50:51 +0000 (18:50 +0000)]
Merge "Add missing txPower parameter" am:
a6c1f6def1
am:
43f71975d0
Change-Id: If6dbc369985eaf18db9c8fd0670683768d613406