355764 Commits

Author SHA1 Message Date
Malcolm Chen
58b90eb578 Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 am: 9348e258cd
am: 6ec70f018e

Change-Id: Ifbbdd159c3cd52282d6a4bdd58c1ddeeff4cc912
2018-01-25 15:30:37 +00:00
TreeHugger Robot
88ffa32cad Merge "WebView: fix docs for setAllow*AccessFromFileUrls" 2018-01-25 15:23:27 +00:00
Malcolm Chen
6ec70f018e Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567
am: 9348e258cd

Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
2018-01-25 15:19:06 +00:00
Narayan Kamath
5bc5457ae5 Merge "Support logging chained WorkSources from JobScheduler." 2018-01-25 15:13:19 +00:00
Malcolm Chen
9348e258cd Merge "Add slotId in INetworkService.aidl methods."
am: b1c6aa4567

Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202
2018-01-25 15:06:59 +00:00
TreeHugger Robot
0cccde6b1a Merge "DropBoxManager: Allow adding a file using an fd" 2018-01-25 14:14:23 +00:00
Adam Stone
27507d8696 Merge changes from topic "DrmMetrics-MostFrameworkMetrics"
* changes:
  Add session times metric definitions.
  Adds additional metric constants.
2018-01-25 14:00:17 +00:00
TreeHugger Robot
53d179d246 Merge "Fix Perfetto.cpp to silence SELinux warnings" 2018-01-25 12:43:34 +00:00
Robert Berry
bb8a385fab Merge "Add #getTransportFlags to BackupDataOutput" 2018-01-25 12:17:45 +00:00
TreeHugger Robot
9543d6eb65 Merge changes from topic "sms_ready"
* changes:
  Unhide SMS over IMS APIs
  Add and trigger onReady API for SMS over IMS.
2018-01-25 12:11:34 +00:00
TreeHugger Robot
3512edbc78 Merge "Remove dependency from RemoteInputController to StatusBarWindowManager." 2018-01-25 11:58:26 +00:00
TreeHugger Robot
7e286aed42 Merge "Move performDismiss utility method to ExpandableNotificationRow" 2018-01-25 11:58:02 +00:00
Yueming Wang
d4739e1d49 Merge "Block brightness slider quick settings when DISALLOW_CONFIG_BRIGHTNESS is set." 2018-01-25 11:48:33 +00:00
Adam Stone
4c61677aba Merge "Added support for getKeyRequest metric." 2018-01-25 11:20:57 +00: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
TreeHugger Robot
78874c5cbb Merge "Add more loggings to debug decryption issues" 2018-01-25 10:58:52 +00:00
yuemingw
eb2bf7d188 Block brightness slider quick settings when DISALLOW_CONFIG_BRIGHTNESS is set.
Test: manual
Bug: 67628870
Change-Id: I30af889e7758c7ea30fa796138d4ca3fefc6e8e9
2018-01-25 10:58:04 +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
TreeHugger Robot
dbdcb0ee52 Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." 2018-01-25 09:29:17 +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
Przemyslaw Szczepaniak
a27e962a57 Merge "Warn when running activity from deprecated app (< min supported sdk)." 2018-01-25 09:20:18 +00:00
Nicolas Geoffray
d2204db2c6 Merge "Rewrite handling of oob priv-apps in framework." 2018-01-25 08:59:28 +00:00
TreeHugger Robot
c510a619bc Merge "keystore: Add Trusted User Presence (TUP) APIs." 2018-01-25 08:36:54 +00:00
nharold
f5092a106b Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 am: bbb4b05a64
am: 461aeb4689

Change-Id: Ic554e34d9b16f522156bc7e8b176f96693e8e32c
2018-01-25 07:59:57 +00:00
Chalard Jean
5a15b7df1f Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: a8452ed2a6 am: 806f0191d4
am: 16897eb4aa

Change-Id: I06a64bbfaa501f860d7078cb2cc6d9af60b57eb8
2018-01-25 07:51:11 +00:00
nharold
461aeb4689 Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4
am: bbb4b05a64

Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5
2018-01-25 07:49:59 +00:00
Chalard Jean
16897eb4aa Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: a8452ed2a6
am: 806f0191d4

Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
2018-01-25 07:41:44 +00:00
nharold
bbb4b05a64 Merge "Move Keepalive out of IpSecTransform.Builder"
am: af3fb3efe4

Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604
2018-01-25 07:37:00 +00:00
TreeHugger Robot
18dae16dcd Merge "PackageManager: Add FEATURE_CAMERA_AR" 2018-01-25 07:34:33 +00:00
Chalard Jean
806f0191d4 Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
am: a8452ed2a6

Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
2018-01-25 07:33:35 +00:00
Treehugger Robot
b1c6aa4567 Merge "Add slotId in INetworkService.aidl methods." 2018-01-25 07:13:17 +00:00
Allen Webb
fcd05a94ef keystore: Add Trusted User Presence (TUP) APIs.
Test: m -j KeystoreTests && adb install -r
out/target/product/crosshatch/data/app/KeystoreTests/KeystoreTests.apk
    adb shell am instrument
    'android.security.tests/android.support.test.runner.AndroidJUnitRunner'
Bug: 72476834

Change-Id: I61ee4326a5e31f1cefacd47470b53634fa94c2ef
2018-01-24 23:06:35 -08:00
TreeHugger Robot
6d8cefdde9 Merge "Set ActivityView background to current top task's color" 2018-01-25 06:52:42 +00:00
TreeHugger Robot
d0c260ff41 Merge "Adding guardrails on writing to disk from statsd" 2018-01-25 06:47:29 +00:00
TreeHugger Robot
d07289d08d Merge "Temporarily disable swipe up onboarding" 2018-01-25 06:43:17 +00:00
TreeHugger Robot
73a331f524 Merge "Statsd broadcast subscriber" 2018-01-25 06:23:36 +00:00
nharold
af3fb3efe4 Merge "Move Keepalive out of IpSecTransform.Builder" 2018-01-25 05:50:33 +00:00
TreeHugger Robot
6834ec8e54 Merge "Fix start/pause behavior for AnimatedImageDrawable" 2018-01-25 05:41:21 +00:00
Chalard Jean
c5afaca974 Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" 2018-01-25 05:39:06 +00:00
Chalard Jean
a8452ed2a6 Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" 2018-01-25 05:37:21 +00:00
TreeHugger Robot
224484aaf9 Merge "Re-commit: Add accessibility support for tooltips" 2018-01-25 05:20:46 +00:00
Chalard Jean
477e36c5fb Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.

Bug: 72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
      and seems not to break phone networking
Cherry-pick of : Id2bbf3808e80b19cd055c832c11cf72372710942

Change-Id: I4b88d5eccbdea745a947d12635cd751e38632589
2018-01-25 13:57:51 +09:00
Chalard Jean
cf8c3fe19c Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.

Bug: 72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
      and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942
2018-01-25 04:51:44 +00:00
TreeHugger Robot
3613d936a9 Merge "Exempting allow-while-idle alarms in EBS" 2018-01-25 04:50:27 +00:00
TreeHugger Robot
b214599552 Merge changes from topic "carrier_net_notifier"
* changes:
  Adds SystemMessage for CarrierNetworkNotification
  Carrier Network Notification strings
  Carrier Network Available Notification setting
2018-01-25 04:46:39 +00:00
TreeHugger Robot
d3450b6aa2 Merge "Remove TODO of won't fix bug." 2018-01-25 04:34:51 +00:00
Howard Ro
540aa206e2 Merge "Revert "Revert "Revert "Enable init.rc for statsd to start statsd by default in boot time"""" 2018-01-25 04:32:50 +00:00
Kevin Chyn
be72463b26 Merge "Add a11y descriptions for FingerprintDialog" 2018-01-25 04:31:26 +00:00