Commit Graph

78927 Commits

Author SHA1 Message Date
Tarandeep Singh
20c7cf950d Merge "Make IMS.setBackDisposition() work." 2018-01-25 23:57:34 +00:00
Android Build Merger (Role)
c7810244db Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d am: 5ba62a2194" into oc-mr1-dev-plus-aosp
am: 0bde9c4355

Change-Id: Id17724faabe77fb7eaad7d3a7e009fb57f0d23d0
2018-01-25 23:22:31 +00:00
Android Build Merger (Role)
a6216a86f0 Merge "Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp am: 954ba2c6a1" 2018-01-25 23:06:23 +00:00
Android Build Merger (Role)
6b3dd70b1f Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp
am: 954ba2c6a1

Change-Id: I218eb054ef0da896c72674c597249c6a5120500d
2018-01-25 23:03:11 +00:00
TreeHugger Robot
854211d15b Merge "Store WebView package signatures as Signatures instead of Strings" 2018-01-25 22:58:49 +00:00
TreeHugger Robot
5815664d4b Merge "Add AbstractThreadedSyncAdapter#onUnsyncableAccount API" 2018-01-25 22:47:54 +00:00
Matthew Fritze
9bc0572151 Merge "Add Setting Slices Contract file" 2018-01-25 22:25:54 +00:00
TreeHugger Robot
b93b797199 Merge "Update to the ActivityManager proto" 2018-01-25 22:21:30 +00:00
Hugo Benichi
65bbfa1c6c Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d
am: 5ba62a2194

Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f
2018-01-25 22:19:53 +00:00
Andreas Gampe
d6e151c469 Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98
am: ebc0afd811

Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
2018-01-25 22:10:27 +00:00
Hugo Benichi
5ba62a2194 Merge "Tcp socket metrics: implement INetdEventListener callback"
am: 93b1787a3d

Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb
2018-01-25 21:55:08 +00:00
TreeHugger Robot
ae30c68489 Merge "VideoView2: Remove APIs supported by MediaSession" 2018-01-25 21:53:12 +00:00
Andreas Gampe
ebc0afd811 Merge "ActivityManager: Add support for agents on startup"
am: d5cba89b98

Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
2018-01-25 21:50:42 +00:00
TreeHugger Robot
15dc9d7ddd Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:" 2018-01-25 21:30:22 +00:00
Treehugger Robot
93b1787a3d Merge "Tcp socket metrics: implement INetdEventListener callback" 2018-01-25 19:23:18 +00:00
Calin Juravle
172814085b Merge "Extend the ArtManager profiling API to cover boot image profiling" 2018-01-25 19:10:23 +00:00
Felipe Leme
23a0c7a009 Internal Framework changes needed by DocumentUI's ScopedAccessProvider:
- Changed AM.getGrantedUriPermissions() API.
- Made DocumentsContract.PATH_TREE public.

Also fixed related AM methods to use explicit for on some loops.

Bug: 63720392
Test: manual verification

Change-Id: I33bdcb949f4301534bd8467c8018d6f03b4588a4
2018-01-25 11:04:29 -08:00
Calin Juravle
2b6e24c7e5 Merge "[framework] Extend profile operations to take the profile name" 2018-01-25 18:58:09 +00:00
TreeHugger Robot
15050aaa99 Merge "Statsd broadcasts when it is alive" 2018-01-25 18:55:45 +00:00
TreeHugger Robot
e2975162dc Merge "Adding intent generation for dates and flights" 2018-01-25 18:28:25 +00:00
Treehugger Robot
d5cba89b98 Merge "ActivityManager: Add support for agents on startup" 2018-01-25 18:08:07 +00:00
Artem Iglikov
0edd645492 Merge "Revert "Make idiomatic use of ApkAssets and AssetManager"" 2018-01-25 18:06:49 +00:00
TreeHugger Robot
48726eae32 Merge "Remove unused system api Window.setDisableWallpaperTouchEvents" 2018-01-25 18:05:15 +00:00
TreeHugger Robot
50bdbe3e2f Merge "Add key to store location changer" 2018-01-25 17:59:24 +00:00
TreeHugger Robot
f1b720c488 Merge "Skip priv app full apk verification if has verify" 2018-01-25 17:52:25 +00:00
TreeHugger Robot
c86a420c6e Merge "Finish broadcast radio HAL 2.0 radio service." 2018-01-25 17:49:26 +00:00
TreeHugger Robot
4dadff8be0 Merge "Add confirmation UI protocol to Keystore AIDL definition" 2018-01-25 17:31:38 +00:00
TreeHugger Robot
7f1e49f2ff Merge "Generating StrongBox backed keys" 2018-01-25 17:24:17 +00:00
TreeHugger Robot
3bcddc94ac Merge "Chained attribution for GnssLocationProvider." 2018-01-25 17:14:11 +00:00
Michal Karpinski
3b6be64e85 Merge "Deprecate BackupManager#requestRestore()" 2018-01-25 16:46:25 +00:00
Wale Ogunwale
20f65bbdcd Remove unused system api Window.setDisableWallpaperTouchEvents
Test: builds
Change-Id: Ifd3e271a4af0bc4066747be9a147470498c39e5b
Fixes: 62263432
2018-01-25 08:12:48 -08:00
Selim Cinek
d41477f494 Merge changes from topic "notification_launch"
* changes:
  Added the reply draft as an extra to the content intent
  Launching notification settings correctly inline
  Launching Notification animations inline
2018-01-25 16:05:15 +00:00
Jorim Jaggi
8e725bbad2 Merge changes Id2832518,Ic8c128ed,Id8fde482,I99cc170b
* changes:
  Revert "1/ Create display content window controller to position stacks in the display"
  Revert "2/ Add support for remote Recents animation"
  Revert "3/ Add input consumer to capture touches during a Recents transition"
  Revert "4/ Update SysUI shared lib for Recents transition"
2018-01-25 16:03:21 +00:00
TreeHugger Robot
04d0d0031a Merge "WebView: document Safe Browsing as 'on' by default" 2018-01-25 16:00:00 +00:00
Shuzhen Wang
68dcd18392 Merge "camera2: Add physical camera id in CaptureResult" 2018-01-25 15:52:45 +00:00
Robert Berry
903b092cd6 Merge "Add flag indicating transport is device-to-device transfer" 2018-01-25 15:41:18 +00:00
TreeHugger Robot
88ffa32cad Merge "WebView: fix docs for setAllow*AccessFromFileUrls" 2018-01-25 15:23:27 +00:00
Narayan Kamath
5bc5457ae5 Merge "Support logging chained WorkSources from JobScheduler." 2018-01-25 15:13:19 +00:00
Jorim Jaggi
9f8518e532 Revert "2/ Add support for remote Recents animation"
This reverts commit 0026a5152c.

Breaks presubmits
2018-01-25 15:21:54 +01:00
Jorim Jaggi
86733be8f6 Revert "3/ Add input consumer to capture touches during a Recents transition"
This reverts commit fc78fe9acc.

Breaks presubmits
2018-01-25 15:21:38 +01:00
Artem Iglikov
16b3dff2d5 Revert "Make idiomatic use of ApkAssets and AssetManager"
This reverts commit e70b57a659.

Reason for revert: b/72482083

Bug: 72482083
Change-Id: I36b0aff6d533d7fb59d367a1cd4e96e03df5f462
2018-01-25 13:59:13 +00:00
Robert Berry
98a8e24148 Add flag indicating transport is device-to-device transfer
This flag allows BackupAgent instances to optionally backup more data
for a device-to-device transfer. i.e., an app developer might want to
only backup certain sensitive data if the transport is either
client-side encrypted or a direct device-to-device transfer.

Test: none, as it is just adding a flag
Bug: 72486408
Change-Id: I7512ed0b1510f48789fe47cb8b7379674c315e76
2018-01-25 13:44:10 +00:00
Robert Berry
bb8a385fab Merge "Add #getTransportFlags to BackupDataOutput" 2018-01-25 12:17:45 +00:00
Jan Althaus
705b9e9a1b Adding intent generation for dates and flights
Bug: 67667478
Test: Added, and manually verified intent handling
Change-Id: Ib9e5a0df651690c852b7f44f226ffa768ce524e1
2018-01-25 12:22:04 +01:00
TreeHugger Robot
9402f3a140 Merge "Add support for Multi-A2DP state machines per device" 2018-01-25 11:07:44 +00:00
Pavlin Radoslavov
502af2192c Add support for Multi-A2DP state machines per device
* Update usage of A2dpService API calls that take BluetoothDevice
  as an additional argument
* Update the description for BluetoothA2dp.connect()

Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug: 69269748
Test: Manual
Change-Id: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
2018-01-25 11:05:25 +00:00
Narayan Kamath
8d82825c75 Support logging chained WorkSources from JobScheduler.
Controller by a feature flag, which this change also introduces.

Bug: 62390666
Bug: 70892390
Test: manual, via JobSchedulerTestApp
Test: CtsJobSchedulerTestCases

Change-Id: Ic7dfb7861f7987a1b6eeb4cf3851193e9ad7da84
2018-01-25 09:41:04 +00:00
Robert Berry
39194c0582 Add #getTransportFlags to BackupDataOutput
This allows a BackupAgent to check whether the transport has client-side
encryption enabled. It can then use this information to decide whether
to back up more sensitive data.

Bug: 72299360
Test: Manually verified full & kv backup agents receive transport flags
Test: m -j RunFrameworksServicesRoboTests
Change-Id: Ibd9b5f9479815e1721e9d6b7663d892b9ab3fcae
2018-01-25 09:28:55 +00:00
Robert Berry
3746a7cabb Merge "Remove @hide from incremental flags & return code." 2018-01-25 09:28:29 +00:00
Sungsoo Lim
82af545ca6 VideoView2: Remove APIs supported by MediaSession
Developers can use a MediaController instance from
getMediaController() instead.

Test: build
Change-Id: If58a040155a2a6894227aa89c20e7dbed6643c4e
2018-01-25 17:14:43 +09:00