OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps...
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

7 years agoMerge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps...
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

7 years agoMerge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps...
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

7 years agoMerge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am...
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

7 years agoMerge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131
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

7 years agoMerge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
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

7 years agoMerge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
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

7 years agoMerge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
Treehugger Robot [Thu, 23 Mar 2017 22:53:46 +0000 (22:53 +0000)]
Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"

7 years agoMerge "Notification for MM reject cause code" am: 0805b3486f -s ours
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

7 years agoMerge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
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

7 years agoMerge "Notification for MM reject cause code"
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

7 years agoMerge "Notification for MM reject cause code"
Brad Ebinger [Thu, 23 Mar 2017 21:04:40 +0000 (21:04 +0000)]
Merge "Notification for MM reject cause code"

7 years agoMerge "hotspot2: ignore uninterested headers and content type attributes" am: 7a7bb444cb
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

7 years agoMerge "hotspot2: ignore uninterested headers and content type attributes"
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

7 years agoNotification for MM reject cause code
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

7 years agoMerge "hotspot2: ignore uninterested headers and content type attributes"
Treehugger Robot [Thu, 23 Mar 2017 19:53:58 +0000 (19:53 +0000)]
Merge "hotspot2: ignore uninterested headers and content type attributes"

7 years agoMerge "Notification for MM reject cause code" into stage-aosp-master
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

7 years agoMerge "Notification for MM reject cause code" into stage-aosp-master
TreeHugger Robot [Thu, 23 Mar 2017 19:27:52 +0000 (19:27 +0000)]
Merge "Notification for MM reject cause code" into stage-aosp-master

7 years agowifi: use android.graphics.drawable.Icon for Passpoint icon data
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

7 years agohotspot2: ignore uninterested headers and content type attributes
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

7 years agoMerge "AVRCP version interop pereference (3/3)" am: 48ce402668
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

7 years agoMerge "AVRCP version interop pereference (3/3)"
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

7 years agoMerge "AVRCP version interop pereference (3/3)"
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (3/3)"

7 years agoNotification for MM reject cause code
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

7 years agoMerge "Track libcore commit a2d9879b" am: 4aa106a790
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

7 years agoMerge "Track libcore commit a2d9879b"
Przemyslaw Szczepaniak [Thu, 23 Mar 2017 16:31:28 +0000 (16:31 +0000)]
Merge "Track libcore commit a2d9879b"
am: 4aa106a790

Change-Id: I447493da10ec6e42b9b8fcc379ddae578ee78e91

7 years agoMerge "Track libcore commit a2d9879b"
Treehugger Robot [Thu, 23 Mar 2017 16:20:24 +0000 (16:20 +0000)]
Merge "Track libcore commit a2d9879b"

7 years agoMerge "Skip ListPopupWindow position update if detached" am: c45b10a9cb
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

7 years agoMerge "Default 'persist.sys.timezone' property to GMT if not set on init." am: 302b7a7075
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

7 years agoMerge "Skip ListPopupWindow position update if detached"
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

7 years agoMerge "Default 'persist.sys.timezone' property to GMT if not set on init."
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

7 years agoMerge "Skip ListPopupWindow position update if detached"
Alan Viverette [Thu, 23 Mar 2017 14:17:28 +0000 (14:17 +0000)]
Merge "Skip ListPopupWindow position update if detached"

7 years agoMerge "Default 'persist.sys.timezone' property to GMT if not set on init."
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."

7 years agoDO NOT MERGE: Add state machine model for skipping initial brightness ramps.
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

7 years agoMerge "Bluetooth 5 Enable->Enabled (1/2)" am: fa69eeac5c
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

7 years agoMerge "Bluetooth 5 Enable->Enabled (1/2)"
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

7 years agoMerge "Bluetooth 5 Enable->Enabled (1/2)"
Jakub Pawlowski [Thu, 23 Mar 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)"

7 years agoMerge "Update IBatteryPropertiesRegistrar.aidl to support force updates" am: 0aae170841
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

7 years agoMerge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am...
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

7 years agoMerge "BluetoothGattCallbackExt removal" am: e2ddacaff4
Jakub Pawlowski [Thu, 23 Mar 2017 00:53:41 +0000 (00:53 +0000)]
Merge "BluetoothGattCallbackExt removal" am: e2ddacaff4
am: 2a32d04a24

Change-Id: Id25f495acb6864b1416a2730b5396be99105e43d

7 years agoMerge "Bluetooth: log unexpected crashes and restarts" am: 25b6f08ece
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

7 years agoMerge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
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

7 years agoBluetooth: Use content observer for airplane mode
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

7 years agoMerge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
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

7 years agoMerge "BluetoothGattCallbackExt removal"
Jakub Pawlowski [Thu, 23 Mar 2017 00:44:06 +0000 (00:44 +0000)]
Merge "BluetoothGattCallbackExt removal"
am: e2ddacaff4

Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661

7 years agoMerge "Bluetooth: log unexpected crashes and restarts"
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

7 years agoMerge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
Treehugger Robot [Wed, 22 Mar 2017 23:53:59 +0000 (23:53 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates"

7 years agoBluetooth 5 Enable->Enabled (1/2)
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

7 years agoMerge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."

7 years agoAVRCP version interop pereference (3/3)
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

7 years agoMerge "BluetoothGattCallbackExt removal"
Jakub Pawlowski [Wed, 22 Mar 2017 20:09:37 +0000 (20:09 +0000)]
Merge "BluetoothGattCallbackExt removal"

7 years agoUpdate IBatteryPropertiesRegistrar.aidl to support force updates
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

7 years agoBluetooth: Use content observer for airplane mode
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

7 years agoBluetoothGattCallbackExt removal
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

7 years agoDefault 'persist.sys.timezone' property to GMT if not set on init.
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

7 years agoMerge "Bluetooth: log unexpected crashes and restarts"
Treehugger Robot [Wed, 22 Mar 2017 16:09:03 +0000 (16:09 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts"

7 years agoMerge "Stop holding mProxyLock while downloading PAC script data." am: 7b26041ccc
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

7 years agoMerge "Stop holding mProxyLock while downloading PAC script data."
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

7 years agoMerge "Stop holding mProxyLock while downloading PAC script data."
Treehugger Robot [Wed, 22 Mar 2017 07:47:19 +0000 (07:47 +0000)]
Merge "Stop holding mProxyLock while downloading PAC script data."

7 years agoStop 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

7 years agoMerge "Fix warning: Potential leak of memory pointed to by 'set'" am: 58ba53bd53
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

7 years agoMerge "Fix warning: Potential leak of memory pointed to by 'set'"
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

7 years agoMerge "Fix warning: Potential leak of memory pointed to by 'set'"
Treehugger Robot [Wed, 22 Mar 2017 00:17:32 +0000 (00:17 +0000)]
Merge "Fix warning: Potential leak of memory pointed to by 'set'"

7 years agoRemove bg_non_interactive cgroup [ DO NOT MERGE ]
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

7 years agoChange 'idx' to 'index' in SubscriptionManager & TelephonyManager apis.
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

7 years agoMerge "Remove bg_non_interactive cgroup" am: c6c19bd6c0
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

7 years agoMerge "Remove bg_non_interactive cgroup"
Wei Wang [Tue, 21 Mar 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Remove bg_non_interactive cgroup"
am: c6c19bd6c0

Change-Id: I35917ee0c52720138c901fd638e07f84ae4c3cf3

7 years agoMerge "Remove bg_non_interactive cgroup"
Treehugger Robot [Tue, 21 Mar 2017 22:09:50 +0000 (22:09 +0000)]
Merge "Remove bg_non_interactive cgroup"

7 years agoRemove the now-empty WearBluetoothService from SystemServer am: 3bcc688bce
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

7 years agoRemove the now-empty WearBluetoothService from SystemServer
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

7 years agoMerge "Zygote: Preserve capabilities in WrapperInit" am: 1ae7af10ff
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

7 years agoMerge "Zygote: Preserve capabilities in WrapperInit"
Andreas Gampe [Tue, 21 Mar 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
am: 1ae7af10ff

Change-Id: Ia1ffb03d6e03b098cc634ef2deb3785c6bb87202

7 years agoMerge "Add setScannable to AdvertisingSetParameters (1/2)" am: 7f14b8f095
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

7 years agoMerge "Add missing txPower parameter" am: a6c1f6def1
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

7 years agoMerge "Zygote: Preserve capabilities in WrapperInit"
Andreas Gampe [Tue, 21 Mar 2017 18:45:00 +0000 (18:45 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"

7 years agoMerge "Add setScannable to AdvertisingSetParameters (1/2)"
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

7 years agoMerge "Add missing txPower parameter"
Jakub Pawlowski [Tue, 21 Mar 2017 18:43:21 +0000 (18:43 +0000)]
Merge "Add missing txPower parameter"
am: a6c1f6def1

Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a

7 years agoBluetooth: log unexpected crashes and restarts
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

7 years agoMerge "Add setScannable to AdvertisingSetParameters (1/2)"
Jakub Pawlowski [Tue, 21 Mar 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"

7 years agoAdd 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

7 years agoMerge "Add missing txPower parameter"
Jakub Pawlowski [Tue, 21 Mar 2017 18:36:14 +0000 (18:36 +0000)]
Merge "Add missing txPower parameter"

7 years agoAdd 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

7 years agoMerge "Update to 2017a." am: 2ca0abc8de
Joachim Sauer [Tue, 21 Mar 2017 18:28:16 +0000 (18:28 +0000)]
Merge "Update to 2017a." am: 2ca0abc8de
am: eeca6add23

Change-Id: I7dd23af7452ed9836fb26dad0d7774ce9aef1c36

7 years agoMerge "Update to 2017a."
Joachim Sauer [Tue, 21 Mar 2017 18:22:44 +0000 (18:22 +0000)]
Merge "Update to 2017a."
am: 2ca0abc8de

Change-Id: I0a6dd7f5cef6f7f3634413d012c8f1c84c807aac

7 years agoMerge "Update to 2017a."
Treehugger Robot [Tue, 21 Mar 2017 18:09:33 +0000 (18:09 +0000)]
Merge "Update to 2017a."

7 years agoTrack libcore commit a2d9879b
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

7 years agoZygote: Preserve capabilities in WrapperInit
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

7 years agoUpdate to 2017a.
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

7 years agoMerge "add and incorporate TetheringConfiguration.dump()" am: 9eb959320f
Erik Kline [Tue, 21 Mar 2017 10:22:21 +0000 (10:22 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()" am: 9eb959320f
am: 9e46faff07

Change-Id: I227d8bcd27ae2970ee65d6cc83faa37ff4e4f17a

7 years agoMerge "add and incorporate TetheringConfiguration.dump()"
Erik Kline [Tue, 21 Mar 2017 10:14:19 +0000 (10:14 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
am: 9eb959320f

Change-Id: I29c80b36ddd14e1e03c88c63d35ee9982dcef887

7 years agoMerge "add and incorporate TetheringConfiguration.dump()"
Treehugger Robot [Tue, 21 Mar 2017 10:05:41 +0000 (10:05 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"

7 years agoMerge "Added ETWS primary message default message support" am: 2d3fb48b39
Jack Yu [Tue, 21 Mar 2017 09:26:51 +0000 (09:26 +0000)]
Merge "Added ETWS primary message default message support" am: 2d3fb48b39
am: dfe1743b37

Change-Id: I71a1be66cb84ed8030df4ab9d406c390872f5346

7 years agoMerge "Added ETWS primary message default message support"
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

7 years agoMerge "Added ETWS primary message default message support"
Treehugger Robot [Tue, 21 Mar 2017 09:11:44 +0000 (09:11 +0000)]
Merge "Added ETWS primary message default message support"

7 years agoAdded 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

7 years agoRemove bg_non_interactive cgroup
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

7 years agoMerge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f
Jeremy Klein [Tue, 21 Mar 2017 00:04:11 +0000 (00:04 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f
am: 23d6ba12f1

Change-Id: I35f45927c564773c10da78e1476814f0a1c7f1be

7 years agoMerge "In isTetheringSupported, call isAdmin user from system."
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

7 years agoMerge "In isTetheringSupported, call isAdmin user from system."
Jeremy Klein [Mon, 20 Mar 2017 23:50:57 +0000 (23:50 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."

7 years agoMerge "Bluetooth 5 AdvertisingSet implementation (1/4)" am: f0c963a5b6
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:09 +0000 (22:33 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am: f0c963a5b6
am: 375741e99a

Change-Id: Ieb03aed00cee20c367f52aa8ea1b1fd02a6fbbac