311921 Commits

Author SHA1 Message Date
Anton Philippov
bc44678fb1 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)
2017-03-28 11:25:44 +00:00
fen wang
5149be455c Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am: 5c64adef5f am: 40dca362a0
am: d09d9370da

Change-Id: I9cb8bf8e0b42c13fd4bfdeb661680b8737e0b42f
2017-03-28 05:19:29 +00:00
fen wang
d09d9370da Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am: 5c64adef5f
am: 40dca362a0

Change-Id: I7b59dc216d893553b146ad6e68f2706255d9f860
2017-03-28 05:11:20 +00:00
fen wang
40dca362a0 Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
am: 5c64adef5f

Change-Id: Iff2e13b8c8921c47176fc43e2a35ebd4cd284a96
2017-03-28 05:03:27 +00:00
Treehugger Robot
5c64adef5f Merge "Add Bluetooth LDAC ABR UI to the Developer Options" 2017-03-28 04:54:21 +00:00
fen wang
0716700f5d Add Bluetooth LDAC ABR UI to the Developer Options
Bug: 35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
2017-03-28 04:53:57 +00:00
Phil Weaver
668c34444d Merge "Fix permission checking for a11y volume." 2017-03-28 03:58:16 +00:00
TreeHugger Robot
9a8eb3db62 Merge "Add honored args when auto-paging." 2017-03-28 03:26:01 +00:00
Erik Kline
7f9bbae035 Merge "Add null check to IpManager.dump()" am: 58406d1df2 am: c5bca697ba
am: e398bae572

Change-Id: I172f23945a79191b777e2daf6795e2d228f510a6
2017-03-28 02:38:20 +00:00
Erik Kline
e398bae572 Merge "Add null check to IpManager.dump()" am: 58406d1df2
am: c5bca697ba

Change-Id: Id5ebbea0c64baa24d162c0545d45915c948f45e6
2017-03-28 02:34:15 +00:00
Erik Kline
c5bca697ba Merge "Add null check to IpManager.dump()"
am: 58406d1df2

Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
2017-03-28 02:30:18 +00:00
Treehugger Robot
58406d1df2 Merge "Add null check to IpManager.dump()" 2017-03-28 02:19:22 +00:00
TreeHugger Robot
15e3d0dba8 Merge "Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS." 2017-03-28 02:14:37 +00:00
TreeHugger Robot
0870696681 Merge "Introduced additional lock - dbLock" 2017-03-28 02:12:07 +00:00
TreeHugger Robot
8ad4a429da Merge "Camera: Send onPrepared callback to all shared surfaces" 2017-03-28 02:10:51 +00:00
TreeHugger Robot
a2bd52aca3 Merge "Fix issue with task overlay activities not finishing." 2017-03-28 02:02:34 +00:00
TreeHugger Robot
16456e5aaa Merge "Enable Wifi Wakeup Setting by default." 2017-03-28 01:54:31 +00:00
TreeHugger Robot
84d7e77ace Merge "Provide deprecated API to avoid build breakage" 2017-03-28 01:29:56 +00:00
Fyodor Kupolov
8cd927d8ea 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
2017-03-27 17:55:33 -07:00
TreeHugger Robot
212310ee71 Merge "Fixed yet another missing check for null anchor..." 2017-03-28 00:50:11 +00:00
TreeHugger Robot
77a1f7522e Merge "Parse NotificationChannel ID meta-data." 2017-03-28 00:46:57 +00:00
TreeHugger Robot
31417b3ebf Merge "Deprecate Setting that is no longer used." 2017-03-28 00:45:34 +00:00
TreeHugger Robot
2c6ac0ead0 Merge "Add missing assert that task isn't queued" 2017-03-28 00:41:11 +00:00
TreeHugger Robot
6e42a1d0ce Merge "Moved Session and ViewState to its own classes." 2017-03-28 00:28:59 +00:00
Michael Kwan
1d34605fcb Merge "Catch exception where SwipeDismissLayout cannot monitor screen off." 2017-03-28 00:20:07 +00:00
Peter Qiu
a5b543ec11 Merge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bdedf655 am: 61f58f0676
am: 8e94d9e32d

Change-Id: Ib293b1fed8a7d5101987d50742cdde66dc670d43
2017-03-28 00:09:06 +00:00
Peter Qiu
8e94d9e32d Merge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bdedf655
am: 61f58f0676

Change-Id: I924befd6d9a1fb1e6bdb257bc6d662172d2354d9
2017-03-28 00:03:03 +00:00
TreeHugger Robot
b567b580a8 Merge "Sync the constants in HAL and framework" 2017-03-28 00:02:23 +00:00
Peter Qiu
61f58f0676 Merge "hotspot2: register Passpoint related intents as protected broadcast"
am: 97bdedf655

Change-Id: I06d54b99006d631c5792f823e9ae7da1703a201d
2017-03-27 23:54:37 +00:00
Treehugger Robot
97bdedf655 Merge "hotspot2: register Passpoint related intents as protected broadcast" 2017-03-27 23:44:43 +00:00
TreeHugger Robot
9d421ba050 Merge changes Ia971b2bc,I0001eb3d,I55a6951e
* changes:
  Remove framework-protos from SystemUI
  Disable proguard for PluginDummyLib
  Enable multidex for dx
2017-03-27 23:37:10 +00:00
TreeHugger Robot
d52cdfb89f Merge "Simplify the media button handling logic" 2017-03-27 23:36:38 +00:00
TreeHugger Robot
55bea5e308 Merge "Add a few asserts for possible corruption cases" 2017-03-27 23:30:22 +00:00
TreeHugger Robot
52b716df85 Merge "Don't spam the log during quota calculations." 2017-03-27 23:27:53 +00:00
Mady Mellor
73a55f7506 Merge "Fix for edge swipe/fling to minimize" 2017-03-27 23:26:52 +00:00
Felipe Leme
6f79717014 Fixed yet another missing check for null anchor...
Test: CtsAutoFillServiceTestCases pass
Bug: 36643768

Change-Id: I6f97f3aec88c59a94c593958aca8b4a992d4806e
2017-03-27 15:45:47 -07:00
TreeHugger Robot
2388f0c81c Merge "Disable PIP minimize and put it behind a tuner item" 2017-03-27 22:29:32 +00:00
Shubang
39f285d5a7 Sync the constants in HAL and framework
Test: Build and flash device

Bug: 36233336
Change-Id: Ie81862825b601bdafd7653564d7393686d54f531
2017-03-27 15:15:46 -07:00
Dmitry Dementyev
117e0c9b5a Merge "Add cache for Account Visibility values." 2017-03-27 22:14:34 +00:00
Peter Qiu
cb9ad34e66 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
2017-03-27 15:10:04 -07:00
Phil Weaver
f1a9aff962 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
2017-03-27 14:59:26 -07:00
Jaewan Kim
92dea33bfe 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
2017-03-27 14:58:43 -07:00
Daniel Nishi
f59418f29c 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
2017-03-27 14:52:46 -07:00
John Reck
1b7184f8d2 Add a few asserts for possible corruption cases
Bug: 36502346
Test: builds & boots
Change-Id: Id96a26a30e4a8c6f51a68bf07cfe6bd6d07c244e
2017-03-27 14:47:46 -07:00
Peter Qiu
7c665f783f Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae715e am: 78eeb9b090
am: bc3fefbacd

Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d
2017-03-27 21:38:26 +00:00
John Reck
2f944482ec 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
2017-03-27 21:38:09 +00:00
Amith Yamasani
53e100c468 Provide deprecated API to avoid build breakage
Restored onUtteranceRangeStart() temporarily as a deprecated API.

Bug: 36646809
Test: N/A
Change-Id: I7da927aca4f4ad1f5cc76564e8fdc4261849898b
2017-03-27 14:36:37 -07:00
Jakub Pawlowski
1d978329df Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8ceada8 am: cfe099b01d
am: b4e8fd65bf

Change-Id: I31be1d92cf7ad95214bf353dca20b990a280f996
2017-03-27 21:34:23 +00:00
Peter Qiu
bc3fefbacd Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae715e
am: 78eeb9b090

Change-Id: Icf369fc41387dbd1ed854434f2d77ecd867c4532
2017-03-27 21:33:46 +00:00
Peter Qiu
78eeb9b090 Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am: ae3bae715e

Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd
2017-03-27 21:29:53 +00:00