OSDN Git Service

android-x86/frameworks-base.git
7 years agoExpose ACCESSIBILITY_CAPTIONING_* to Instant Apps
Chad Brubaker [Tue, 28 Mar 2017 23:11:38 +0000 (16:11 -0700)]
Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps

Fixes settings issues seen in Webview startup.
Bug: 34087569
Test: SecurityExceptions go away

Change-Id: I0e3c55e7dc1c17f445d9dc514682e12dad9dc247

7 years agoFix battery saver tile label
Jason Monk [Mon, 27 Mar 2017 20:28:55 +0000 (16:28 -0400)]
Fix battery saver tile label

Test: visual
Change-Id: I2cfb819778eeb969979aa2a3ed8c35744a63f875
Fixes: 36238774
(cherry picked from commit 368a8aec2c13ca096f6e3c15c1cb70e4a3752d4c)

7 years agoQS Animation tweaks
Jason Monk [Mon, 27 Mar 2017 21:09:30 +0000 (17:09 -0400)]
QS Animation tweaks

Test: visual
Change-Id: Ic81d874511bf87fb0e8d9bf08e27346919ebc46e
Fixes: 35990413
(cherry picked from commit c34e249609dadc86bf3a0139a4038388c34a42b6)

7 years agoFix spacing for loading in QS
Jason Monk [Mon, 27 Mar 2017 20:54:30 +0000 (16:54 -0400)]
Fix spacing for loading in QS

Test: visual
Change-Id: I8065885ec3d2badd9d7c2116a6075eb48e2b7697
Fixes: 30292983
(cherry picked from commit 6cfc63a92779c000c659c70f44efa231fce73476)

7 years agoMerge "SmartSelection: Pass hintFlags to native library." into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 14:23:18 +0000 (14:23 +0000)]
Merge "SmartSelection: Pass hintFlags to native library." into oc-dev

7 years agoAdd null check in BackupManagerService$PerformBackupTask.handleCancel()
Anton Philippov [Mon, 27 Mar 2017 13:49:04 +0000 (14:49 +0100)]
Add null check in BackupManagerService$PerformBackupTask.handleCancel()

handleCancel() can be called before we start backing up any particular
package, therefore we need to properly handle log messages in that case.

Bug: 36638539
Test: manual
Change-Id: Ic96e2fbad5c0a79640a3419d187e8b5e4d265de3
(cherry picked from commit 519a87db8fabb49f299aa384aeb5cfe4dfedf907)

7 years agoSmartSelection: Pass hintFlags to native library.
Abodunrinwa Toki [Mon, 27 Mar 2017 20:09:23 +0000 (21:09 +0100)]
SmartSelection: Pass hintFlags to native library.

Test: cts-tradefed run cts-dev -m CtsViewTestCases -t android.view.textclassifier.cts.TextClassificationManagerTest
Tests have been written on the native side.
Bug: 35416389

Change-Id: If2de73391e1a343e0dc7698039ad1464cedfbf08

7 years agoMerge "Add Bluetooth LDAC ABR UI to the Developer Options" am: 5c64adef5f am: 40dca362a0
fen wang [Tue, 28 Mar 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am: 5c64adef5f am: 40dca362a0
am: d09d9370da

Change-Id: I9cb8bf8e0b42c13fd4bfdeb661680b8737e0b42f

7 years agoMerge "Add Bluetooth LDAC ABR UI to the Developer Options" am: 5c64adef5f
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

7 years agoMerge "Add Bluetooth LDAC ABR UI to the Developer Options"
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

7 years agoMerge "Add Bluetooth LDAC ABR UI to the Developer Options"
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options"

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

7 years agoMerge "Fix permission checking for a11y volume."
Phil Weaver [Tue, 28 Mar 2017 03:58:12 +0000 (03:58 +0000)]
Merge "Fix permission checking for a11y volume."

7 years agoMerge "Add honored args when auto-paging."
TreeHugger Robot [Tue, 28 Mar 2017 03:25:58 +0000 (03:25 +0000)]
Merge "Add honored args when auto-paging."

7 years agoMerge "Add null check to IpManager.dump()" am: 58406d1df2 am: c5bca697ba
Erik Kline [Tue, 28 Mar 2017 02:38:20 +0000 (02:38 +0000)]
Merge "Add null check to IpManager.dump()" am: 58406d1df2 am: c5bca697ba
am: e398bae572

Change-Id: I172f23945a79191b777e2daf6795e2d228f510a6

7 years agoMerge "Add null check to IpManager.dump()" am: 58406d1df2
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

7 years agoMerge "Add null check to IpManager.dump()"
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

7 years agoMerge "Add null check to IpManager.dump()"
Treehugger Robot [Tue, 28 Mar 2017 02:19:21 +0000 (02:19 +0000)]
Merge "Add null check to IpManager.dump()"

7 years agoMerge "Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS."
TreeHugger Robot [Tue, 28 Mar 2017 02:14:33 +0000 (02:14 +0000)]
Merge "Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS."

7 years agoMerge "Introduced additional lock - dbLock"
TreeHugger Robot [Tue, 28 Mar 2017 02:12:04 +0000 (02:12 +0000)]
Merge "Introduced additional lock - dbLock"

7 years agoMerge "Camera: Send onPrepared callback to all shared surfaces"
TreeHugger Robot [Tue, 28 Mar 2017 02:10:43 +0000 (02:10 +0000)]
Merge "Camera: Send onPrepared callback to all shared surfaces"

7 years agoMerge "Fix issue with task overlay activities not finishing."
TreeHugger Robot [Tue, 28 Mar 2017 02:02:30 +0000 (02:02 +0000)]
Merge "Fix issue with task overlay activities not finishing."

7 years agoMerge "Enable Wifi Wakeup Setting by default."
TreeHugger Robot [Tue, 28 Mar 2017 01:54:26 +0000 (01:54 +0000)]
Merge "Enable Wifi Wakeup Setting by default."

7 years agoMerge "Provide deprecated API to avoid build breakage"
TreeHugger Robot [Tue, 28 Mar 2017 01:29:52 +0000 (01:29 +0000)]
Merge "Provide deprecated API to avoid build breakage"

7 years agoIntroduced additional lock - dbLock
Fyodor Kupolov [Tue, 28 Mar 2017 00:02:11 +0000 (17:02 -0700)]
Introduced additional lock - dbLock

Right now it is always used with cacheLock. In the future, we will be
adding optimizations to reduce cacheLock contention by only holding it
when updating the cache.

This change is non-functional and doesn't change the current locking
contract

Test: Manual + AccountManagerServiceTest
Bug: 36485175
Change-Id: Iebc437463958d33b32fc1273a84680c22ac60825

7 years agoMerge "Fixed yet another missing check for null anchor..."
TreeHugger Robot [Tue, 28 Mar 2017 00:50:07 +0000 (00:50 +0000)]
Merge "Fixed yet another missing check for null anchor..."

7 years agoMerge "Parse NotificationChannel ID meta-data."
TreeHugger Robot [Tue, 28 Mar 2017 00:46:52 +0000 (00:46 +0000)]
Merge "Parse NotificationChannel ID meta-data."

7 years agoMerge "Deprecate Setting that is no longer used."
TreeHugger Robot [Tue, 28 Mar 2017 00:45:30 +0000 (00:45 +0000)]
Merge "Deprecate Setting that is no longer used."

7 years agoMerge "Add missing assert that task isn't queued"
TreeHugger Robot [Tue, 28 Mar 2017 00:41:08 +0000 (00:41 +0000)]
Merge "Add missing assert that task isn't queued"

7 years agoMerge "Moved Session and ViewState to its own classes."
TreeHugger Robot [Tue, 28 Mar 2017 00:28:56 +0000 (00:28 +0000)]
Merge "Moved Session and ViewState to its own classes."

7 years agoMerge "Catch exception where SwipeDismissLayout cannot monitor screen off."
Michael Kwan [Tue, 28 Mar 2017 00:20:02 +0000 (00:20 +0000)]
Merge "Catch exception where SwipeDismissLayout cannot monitor screen off."

7 years agoMerge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bde...
Peter Qiu [Tue, 28 Mar 2017 00:09:06 +0000 (00:09 +0000)]
Merge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bdedf655 am: 61f58f0676
am: 8e94d9e32d

Change-Id: Ib293b1fed8a7d5101987d50742cdde66dc670d43

7 years agoMerge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bde...
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

7 years agoMerge "Sync the constants in HAL and framework"
TreeHugger Robot [Tue, 28 Mar 2017 00:02:18 +0000 (00:02 +0000)]
Merge "Sync the constants in HAL and framework"

7 years agoMerge "hotspot2: register Passpoint related intents as protected broadcast"
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

7 years agoMerge "hotspot2: register Passpoint related intents as protected broadcast"
Treehugger Robot [Mon, 27 Mar 2017 23:44:42 +0000 (23:44 +0000)]
Merge "hotspot2: register Passpoint related intents as protected broadcast"

7 years agoMerge changes Ia971b2bc,I0001eb3d,I55a6951e
TreeHugger Robot [Mon, 27 Mar 2017 23:37:06 +0000 (23:37 +0000)]
Merge changes Ia971b2bc,I0001eb3d,I55a6951e

* changes:
  Remove framework-protos from SystemUI
  Disable proguard for PluginDummyLib
  Enable multidex for dx

7 years agoMerge "Simplify the media button handling logic"
TreeHugger Robot [Mon, 27 Mar 2017 23:36:33 +0000 (23:36 +0000)]
Merge "Simplify the media button handling logic"

7 years agoMerge "Add a few asserts for possible corruption cases"
TreeHugger Robot [Mon, 27 Mar 2017 23:30:18 +0000 (23:30 +0000)]
Merge "Add a few asserts for possible corruption cases"

7 years agoMerge "Don't spam the log during quota calculations."
TreeHugger Robot [Mon, 27 Mar 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Don't spam the log during quota calculations."

7 years agoMerge "Fix for edge swipe/fling to minimize"
Mady Mellor [Mon, 27 Mar 2017 23:26:47 +0000 (23:26 +0000)]
Merge "Fix for edge swipe/fling to minimize"

7 years agoFixed yet another missing check for null anchor...
Felipe Leme [Mon, 27 Mar 2017 22:05:35 +0000 (15:05 -0700)]
Fixed yet another missing check for null anchor...

Test: CtsAutoFillServiceTestCases pass
Bug: 36643768

Change-Id: I6f97f3aec88c59a94c593958aca8b4a992d4806e

7 years agoMerge "Disable PIP minimize and put it behind a tuner item"
TreeHugger Robot [Mon, 27 Mar 2017 22:29:27 +0000 (22:29 +0000)]
Merge "Disable PIP minimize and put it behind a tuner item"

7 years agoSync the constants in HAL and framework
Shubang [Tue, 21 Mar 2017 19:56:08 +0000 (12:56 -0700)]
Sync the constants in HAL and framework

Test: Build and flash device

Bug: 36233336
Change-Id: Ie81862825b601bdafd7653564d7393686d54f531

7 years agoMerge "Add cache for Account Visibility values."
Dmitry Dementyev [Mon, 27 Mar 2017 22:14:29 +0000 (22:14 +0000)]
Merge "Add cache for Account Visibility values."

7 years agohotspot2: 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

7 years agoFix permission checking for a11y volume.
Phil Weaver [Fri, 24 Mar 2017 00:21:29 +0000 (17:21 -0700)]
Fix permission checking for a11y volume.

Adding new permission for changing accessibility volume
to allow system UI to change it. Also providing audio
manager with a whitelist of bound accessibility service
uids so it can allow servics to change the volume.

Bug: 36569297
Test: Adding CTS test in linked CL.
Change-Id: I4f327e3a251fc3780c5957f41217c2ef5bb8b16e

7 years agoSimplify the media button handling logic
Jaewan Kim [Thu, 2 Feb 2017 02:52:08 +0000 (11:52 +0900)]
Simplify the media button handling logic

Here's the new media handling logic.

1. If the foreground app consumes the media key event
  (Activity.onKeyDown/Up() or Activity.setMediaController()),
  we stop here.
2. Find the media app whose AudioPlaybackConfiguration becomes
  PLAYER_STATE_STARTED lastly across the boot. The media app is the app
  with the media session.
  - If its session is still alive, send the media key event
    to the media session.
  - If its session has been released but the session set the media
    button receiver, send the media key event through the media button
    receiver.
  - If it has multiple media sessions, pick the media session whose
    PlaybackState matches with the AudioPlaybackConfiguration's player
    state.
3. Stop here. Don't try revive any other app.

This approach has two limitations.
1. If an app has multiple AudioPlaybackConfigurations and/or
   media sessions, the MediaSessionService may pick the wrong media
   session to send media key events.
2. If an app with a media session plays sound effects differently from
   the SoundPool class, the MediaSessionService would consider the app
   as the lastly played media app.

Bug: 33032080
Test: Manual tests as follows
  1. Checked that the lastly played app receives the media key events
     although the app's media session doesn't report its playback state.
  2. Checked that the lastly played app receives the media key events
     although the app's media session is released.
  3. Checked that the lastly played app doesn't receive the media key
     events if its playback is remote.
Change-Id: I1fd6f9eee0750da4dea9fcc7401fdb1c3f249a72

7 years agoDon't spam the log during quota calculations.
Daniel Nishi [Mon, 27 Mar 2017 21:52:46 +0000 (14:52 -0700)]
Don't spam the log during quota calculations.

We base the cache quotas on usage stats on the device. These stats,
however, can contain entries from apps which are no longer installed.
In this case, we skip its calculation and log a warning. This patch
removes the warning aspect of it, because it is a legitimate case.

Change-Id: I2a6a797966bfee007515735308535a5dcc118f03
Fixes: 36649802
Test: Manual

7 years agoAdd a few asserts for possible corruption cases
John Reck [Mon, 27 Mar 2017 21:47:46 +0000 (14:47 -0700)]
Add a few asserts for possible corruption cases

Bug: 36502346
Test: builds & boots
Change-Id: Id96a26a30e4a8c6f51a68bf07cfe6bd6d07c244e

7 years agoMerge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3ba...
Peter Qiu [Mon, 27 Mar 2017 21:38:26 +0000 (21:38 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae715e am: 78eeb9b090
am: bc3fefbacd

Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d

7 years agoAdd missing assert that task isn't queued
John Reck [Mon, 27 Mar 2017 21:34:28 +0000 (14:34 -0700)]
Add missing assert that task isn't queued

Probably won't fix anything but this assert is in queue()
but not queueAtFront() and inserting a task twice is Really Bad.

Bug: 36139852
Test:  Â¯\_(ツ)_/¯
Change-Id: Ida0f829eecfdd46c17c36b816528c49d12b7cf29

7 years agoProvide deprecated API to avoid build breakage
Amith Yamasani [Mon, 27 Mar 2017 21:36:37 +0000 (14:36 -0700)]
Provide deprecated API to avoid build breakage

Restored onUtteranceRangeStart() temporarily as a deprecated API.

Bug: 36646809
Test: N/A
Change-Id: I7da927aca4f4ad1f5cc76564e8fdc4261849898b

7 years agoMerge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8ceada8 am: cfe09...
Jakub Pawlowski [Mon, 27 Mar 2017 21:34:23 +0000 (21:34 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8ceada8 am: cfe099b01d
am: b4e8fd65bf

Change-Id: I31be1d92cf7ad95214bf353dca20b990a280f996

7 years agoMerge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3ba...
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

7 years agoMerge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
Peter Qiu [Mon, 27 Mar 2017 21:29:53 +0000 (21:29 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am: ae3bae715e

Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd

7 years agoMerge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8ceada8
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

7 years agoMerge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
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

7 years agoMerge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
Peter Qiu [Mon, 27 Mar 2017 21:21:41 +0000 (21:21 +0000)]
Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"

7 years agoMerge "Avoid NPE when PopupWindow is shown while dismissing"
Alan Viverette [Mon, 27 Mar 2017 21:21:09 +0000 (21:21 +0000)]
Merge "Avoid NPE when PopupWindow is shown while dismissing"

7 years agoMerge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
Jakub Pawlowski [Mon, 27 Mar 2017 21:15:20 +0000 (21:15 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"

7 years agoFix for edge swipe/fling to minimize
Mady Mellor [Mon, 27 Mar 2017 21:10:46 +0000 (14:10 -0700)]
Fix for edge swipe/fling to minimize

- Actually include check for fling
- Base left or right side on starting position instead of current position

Test:  Long quick swipe PIP from opposite edge of screen -> no longer minimizes
Bug:35358628
Change-Id: I7cd62b94943afe28b89a8bcb0e0cab58bc0841a9

7 years agoMerge "make carrier default app direct boot aware" am: 98ded6c9ab am: 3f26682252
Chen Xu [Mon, 27 Mar 2017 21:06:09 +0000 (21:06 +0000)]
Merge "make carrier default app direct boot aware" am: 98ded6c9ab am: 3f26682252
am: 51742e58fc

Change-Id: Ic3f9de6063bb605c87af8d6218c0cf7306d2c5d0

7 years agoMerge "Fix nativeProcs being null."
Steven Moreland [Mon, 27 Mar 2017 21:03:18 +0000 (21:03 +0000)]
Merge "Fix nativeProcs being null."

7 years agoFix nativeProcs being null.
Martijn Coenen [Mon, 27 Mar 2017 19:45:19 +0000 (12:45 -0700)]
Fix nativeProcs being null.

dumpStackTraces originally checked this. This only happens when a silent
ANR is triggerred on a process name not in NATIVE_STACKS_OF_INTEREST.

Bug: 36414311
Bug: 36652737
Test: manual
Change-Id: I24402fb2ef2e08482f866dc1086ce83c1365d7ec

7 years agoMerge "make carrier default app direct boot aware" am: 98ded6c9ab
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

7 years agowifi: catch UnsupportedOperationException for getMatchingWifiConfig
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

7 years agoMerge "make carrier default app direct boot aware"
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

7 years agoMerge "Updating to new aspect ratio limits."
TreeHugger Robot [Mon, 27 Mar 2017 20:54:37 +0000 (20:54 +0000)]
Merge "Updating to new aspect ratio limits."

7 years agoMerge "make carrier default app direct boot aware"
Chen Xu [Mon, 27 Mar 2017 20:45:13 +0000 (20:45 +0000)]
Merge "make carrier default app direct boot aware"

7 years agoMerge "Uncomment a test."
Sudheer Shanka [Mon, 27 Mar 2017 20:40:31 +0000 (20:40 +0000)]
Merge "Uncomment a test."

7 years agoFix issue with task overlay activities not finishing.
Winson Chung [Fri, 24 Mar 2017 23:22:12 +0000 (16:22 -0700)]
Fix issue with task overlay activities not finishing.

- The task overlay activity should only exist when there are activities
  present in the task.  When the last such activity is finished, we should
  remove the whole task entirely including the task overlay.
- Exposing the task overlay apis to CTS

Bug: 36507456
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testFinishPipActivityWithTaskOverlay
Change-Id: I1dabe7782fb6769a90d832664e8052be158041e1

7 years agoAdd null check to IpManager.dump()
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

7 years agoAdd cache for Account Visibility values.
Dmitry Dementyev [Thu, 23 Mar 2017 19:29:17 +0000 (12:29 -0700)]
Add cache for Account Visibility values.

Test: cts
Bug: 36485175
Change-Id: I075b81f8b287199d51ea09dc1108748310ab846c

7 years agoMerge "Fixed logic error with setting maxAspectRatio"
Wale Ogunwale [Mon, 27 Mar 2017 20:20:52 +0000 (20:20 +0000)]
Merge "Fixed logic error with setting maxAspectRatio"

7 years agoMerge "Fix status bar visibility initialization"
Jason Monk [Mon, 27 Mar 2017 20:20:22 +0000 (20:20 +0000)]
Merge "Fix status bar visibility initialization"

7 years agoRemove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS.
Stephen Chen [Wed, 22 Mar 2017 22:50:56 +0000 (15:50 -0700)]
Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS.

ConfigureWifiSettings page will instead use WIFI_IP_SETTINGS intent.
Intent for SavedAccessPointsSettingsActivity is unused and can be
removed.

Bug: 34392691
Bug: 36516068
Test: make
Change-Id: I86547df387b41241d531e361014581d0763008ee

7 years agoMerge "MediaCas: rethrow MediaCas specific exception"
TreeHugger Robot [Mon, 27 Mar 2017 20:17:10 +0000 (20:17 +0000)]
Merge "MediaCas: rethrow MediaCas specific exception"

7 years agoDisable PIP minimize and put it behind a tuner item
Mady Mellor [Mon, 27 Mar 2017 18:09:50 +0000 (11:09 -0700)]
Disable PIP minimize and put it behind a tuner item

Test: Have PIP, try to minimize it (does not minimize).
      Enable tuner item, have PIP, try to minimize it (success!)
Bug:35358768
Change-Id: Iee9c26055decd06dc27233ff21edb6905eef9d23

7 years agoEnable Wifi Wakeup Setting by default.
Stephen Chen [Mon, 27 Mar 2017 17:28:04 +0000 (10:28 -0700)]
Enable Wifi Wakeup Setting by default.

Bug: 36385983
Bug: 32913119
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/SettingsProviderTest.java
Change-Id: I99f9aea6f85675eb1c92fe16f99755117110636a

7 years agoMerge "Compute the focused window in display focus order"
David Stevens [Mon, 27 Mar 2017 19:59:53 +0000 (19:59 +0000)]
Merge "Compute the focused window in display focus order"

7 years agoMerge "Fixed issue with SCREEN_ORIENTATION_BEHIND not working correctly"
TreeHugger Robot [Mon, 27 Mar 2017 19:58:29 +0000 (19:58 +0000)]
Merge "Fixed issue with SCREEN_ORIENTATION_BEHIND not working correctly"

7 years agoMoved Session and ViewState to its own classes.
Felipe Leme [Mon, 27 Mar 2017 17:16:08 +0000 (10:16 -0700)]
Moved Session and ViewState to its own classes.

Such separation will make it easier to maintain them...

Bug: 35707731
Test: CtsAutoFillServiceTestCases pass
Change-Id: I7164598e1ce54dca8cdb8286f65ec4baa926f98d

7 years agoBluetooth GATT callback naming fix "Ext" -> "" (1/2)
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

7 years agoMerge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am: a1e206a335 am:...
Lorenzo Colitti [Mon, 27 Mar 2017 19:27:43 +0000 (19:27 +0000)]
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am: a1e206a335 am: 37afaac70d
am: d042c3f400

Change-Id: Ic8a35c9f2d9de0b36cb7ab3f8227f0bc298d672f

7 years agoMerge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am: a1e206a335
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

7 years agoMerge "TextClassifier updates"
TreeHugger Robot [Mon, 27 Mar 2017 19:20:58 +0000 (19:20 +0000)]
Merge "TextClassifier updates"

7 years agoUpdating to new aspect ratio limits.
Winson Chung [Mon, 6 Mar 2017 23:07:25 +0000 (15:07 -0800)]
Updating to new aspect ratio limits.

Bug: 35949789
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Id47bdee0903744efb6aa3200691cd7817463aa13

7 years agoMerge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
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

7 years agoMerge "Prevent cleaning up and resuming null activity when task is reparented."
Winson Chung [Mon, 27 Mar 2017 19:08:53 +0000 (19:08 +0000)]
Merge "Prevent cleaning up and resuming null activity when task is reparented."

7 years agoMerge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
Lorenzo Colitti [Mon, 27 Mar 2017 19:08:24 +0000 (19:08 +0000)]
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."

7 years agoMerge "Adding a comment specifying the timebase for emergency call time"
Michael Dooley [Mon, 27 Mar 2017 19:05:48 +0000 (19:05 +0000)]
Merge "Adding a comment specifying the timebase for emergency call time"

7 years agoMerge "Fix PiP dismissing on drag away from bottom and then fling"
TreeHugger Robot [Mon, 27 Mar 2017 18:59:41 +0000 (18:59 +0000)]
Merge "Fix PiP dismissing on drag away from bottom and then fling"

7 years agoMerge "Unbind from service on app killed and dedup association requests"
TreeHugger Robot [Mon, 27 Mar 2017 18:43:29 +0000 (18:43 +0000)]
Merge "Unbind from service on app killed and dedup association requests"

7 years agoMerge "Register functor draw correctly"
TreeHugger Robot [Mon, 27 Mar 2017 18:36:23 +0000 (18:36 +0000)]
Merge "Register functor draw correctly"

7 years agoMerge "Clean up and cover more QS metrics"
Jason Monk [Mon, 27 Mar 2017 18:24:16 +0000 (18:24 +0000)]
Merge "Clean up and cover more QS metrics"

7 years agoCompute the focused window in display focus order
David Stevens [Fri, 24 Mar 2017 20:04:00 +0000 (13:04 -0700)]
Compute the focused window in display focus order

A WindowContainer's children are sorted so the focused child is at the
end of the list, so RootWindowContainer needs to iterate from end to
start when looking for the focused window.

Bug: 36590788
Test: DisplayContentTests#testFocusedWindowMultipleDisplays
Change-Id: I56e6b7d2054bc1e74b54a4f99706a08d278fa2e1

7 years agoFixed issue with SCREEN_ORIENTATION_BEHIND not working correctly
Wale Ogunwale [Sat, 25 Mar 2017 00:36:38 +0000 (17:36 -0700)]
Fixed issue with SCREEN_ORIENTATION_BEHIND not working correctly

If an app specifies SCREEN_ORIENTATION_BEHIND, then use the orientation
of the app behind it regardless of the visibility state of the app
behind.

Fixes: 35281868
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests
Change-Id: Ieba4e4bb1a7f47cd6f082491d37fcabcf5bd5199

7 years agoMerge "Fixed check for null Anchor."
TreeHugger Robot [Mon, 27 Mar 2017 18:02:21 +0000 (18:02 +0000)]
Merge "Fixed check for null Anchor."

7 years agoUncomment a test.
Sudheer Shanka [Fri, 24 Mar 2017 22:53:14 +0000 (15:53 -0700)]
Uncomment a test.

It was commented earlier because of a crash. Since that issue has been
fixed, uncomment the test.

Bug: 27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5f2b1b0bffe032633f42c8c34ed8a7ae5a3dfc10