TreeHugger Robot
aa7fab9483
Merge "statsd: Add BatteryCycleCount atom"
2019-01-22 17:56:55 +00:00
Amy Zhang
b17eb4a72c
Merge "Use SystemProperties set and getBoolean for Constants property"
2019-01-22 17:47:25 +00:00
Tobias Thierer
3985258afd
Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c am: 6804819923
...
am: 37db9722a6
2019-01-22 09:32:14 -08:00
Tobias Thierer
37db9722a6
Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c
...
am: 6804819923
2019-01-22 09:22:30 -08:00
TreeHugger Robot
04780a12cc
Merge "Fix changing package installer after rollback"
2019-01-22 17:19:24 +00:00
Tobias Thierer
6804819923
Merge "Deprecate SSLCertificateSocketFactory"
...
am: f86156158c
2019-01-22 09:13:20 -08:00
Christine Franks
158600f6ca
Merge "Add supported color transform capabilities"
2019-01-22 17:05:02 +00:00
Lucas Dupin
a54251feab
Merge "Do double tap detection to wake up device while docked."
2019-01-22 17:04:27 +00:00
Tobias Thierer
f86156158c
Merge "Deprecate SSLCertificateSocketFactory"
2019-01-22 16:57:50 +00:00
TreeHugger Robot
b2b7220ed5
Merge "Scale task snapshots to very small on low RAM."
2019-01-22 16:56:18 +00:00
Lorenzo Colitti
c2888cbc48
Merge "Migrate ICaptivePortal to stable AIDL"
2019-01-22 15:38:07 +00:00
Tyler Gunn
7b31759f0d
Merge "Support for treating single party IMS conference as a standalone call." am: 89e53d81ce am: 955c9adb36
...
am: 4fd8e1b376
2019-01-22 07:31:55 -08:00
Tyler Gunn
4fd8e1b376
Merge "Support for treating single party IMS conference as a standalone call." am: 89e53d81ce
...
am: 955c9adb36
2019-01-22 07:20:11 -08:00
Pavel Grafov
18d0de7ecc
Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1 am: 5fb1be5c0b
...
am: 43c0ffc1b1
2019-01-22 07:19:18 -08:00
Pavel Grafov
43c0ffc1b1
Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1
...
am: 5fb1be5c0b
2019-01-22 07:09:43 -08:00
Tyler Gunn
955c9adb36
Merge "Support for treating single party IMS conference as a standalone call."
...
am: 89e53d81ce
2019-01-22 07:09:11 -08:00
Richard Uhler
6afb4045c8
Merge changes If3a6eeb3,I2a29dc60
...
* changes:
Factor out code for loading and saving rollback data.
Store meta data for a rollback in a single file.
2019-01-22 15:03:44 +00:00
Pavel Grafov
5fb1be5c0b
Merge "Add API for VPN apps to query always-on and lockdown."
...
am: 479c0769f1
2019-01-22 07:00:53 -08:00
Tyler Gunn
89e53d81ce
Merge "Support for treating single party IMS conference as a standalone call."
2019-01-22 14:57:10 +00:00
Zimuzo
87698d8e11
Fix changing package installer after rollback
...
When executing rollbacks, we now set the SessionParams installerPackageName
to the targetPackage installer instead of using the default which is the
calling package.
Test: atest RollbackTest with Ic85464583f7c6b0778d853a87670d250a42c33de in
succession works.
Bug: 112431924
Change-Id: Id115c2c0d6838d81213dfc0d186ef30e13d6f879
2019-01-22 14:53:43 +00:00
TreeHugger Robot
f9c42c76a0
Merge "Fix dpm force-network-logs"
2019-01-22 14:45:35 +00:00
Pavel Grafov
479c0769f1
Merge "Add API for VPN apps to query always-on and lockdown."
2019-01-22 14:43:06 +00:00
Leon Scroggins
a7404d45b1
Merge "Convert @ColorLongs in native code"
2019-01-22 14:33:10 +00:00
Leon Scroggins
a1809f383d
Merge "ColorSpaces have native SkColorSpaces"
2019-01-22 14:32:11 +00:00
Remi NGUYEN VAN
7aa9b885c3
Merge "Expose UIDs for NetworkStack permission checks" am: 3b887bdf4a am: 29515d751b
...
am: f10038e9ca
2019-01-22 06:13:46 -08:00
Remi NGUYEN VAN
f10038e9ca
Merge "Expose UIDs for NetworkStack permission checks" am: 3b887bdf4a
...
am: 29515d751b
2019-01-22 06:04:32 -08:00
Remi NGUYEN VAN
29515d751b
Merge "Expose UIDs for NetworkStack permission checks"
...
am: 3b887bdf4a
2019-01-22 05:53:20 -08:00
Remi NGUYEN VAN
75df50dc83
Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27 am: b6eb7e19e2
...
am: f012b976f9
2019-01-22 05:43:59 -08:00
Remi NGUYEN VAN
3b887bdf4a
Merge "Expose UIDs for NetworkStack permission checks"
2019-01-22 13:40:57 +00:00
Remi NGUYEN VAN
f012b976f9
Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27
...
am: b6eb7e19e2
2019-01-22 05:34:33 -08:00
Remi NGUYEN VAN
b809148b9a
Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a am: 8e4ce11318
...
am: c904972acd
2019-01-22 05:32:01 -08:00
Remi NGUYEN VAN
b6eb7e19e2
Merge "Remove InterfaceController dependency on NMS"
...
am: 06adb08d27
2019-01-22 05:25:12 -08:00
Remi NGUYEN VAN
c904972acd
Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a
...
am: 8e4ce11318
2019-01-22 05:22:30 -08:00
Remi NGUYEN VAN
8e4ce11318
Merge changes Ieef54d84,Ica3e88c2
...
am: 491f53523a
2019-01-22 05:14:58 -08:00
Remi NGUYEN VAN
06adb08d27
Merge "Remove InterfaceController dependency on NMS"
2019-01-22 13:14:06 +00:00
Android Build Merger (Role)
cf0bfd9885
Merge "Merge "Add SystemApi utility for raw sockets." am: 91c81c13b6 am: 510d2f82ad am: 4593e07944"
2019-01-22 13:12:10 +00:00
Remi NGUYEN VAN
1f7632422d
Merge "Add SystemApi utility for raw sockets." am: 91c81c13b6 am: 510d2f82ad
...
am: 4593e07944
2019-01-22 05:11:38 -08:00
TreeHugger Robot
5ec2516b0f
Merge "Define Nfc statistic data atoms"
2019-01-22 13:11:18 +00:00
Remi NGUYEN VAN
4593e07944
Merge "Add SystemApi utility for raw sockets." am: 91c81c13b6
...
am: 510d2f82ad
2019-01-22 05:02:22 -08:00
Remi NGUYEN VAN
491f53523a
Merge changes Ieef54d84,Ica3e88c2
...
* changes:
Remove NetworkStack dependencies on hidden members
Expose ServiceSpecificException as @SystemApi.
2019-01-22 13:00:10 +00:00
Remi NGUYEN VAN
510d2f82ad
Merge "Add SystemApi utility for raw sockets."
...
am: 91c81c13b6
2019-01-22 04:53:05 -08:00
Jin Seok Park
bdca7e3b5d
Merge "Unhide MediaSessionManager APIs"
2019-01-22 12:41:53 +00:00
Remi NGUYEN VAN
91c81c13b6
Merge "Add SystemApi utility for raw sockets."
2019-01-22 12:38:33 +00:00
lpeter
8a5f470c01
Do double tap detection to wake up device while docked.
...
In order to keep the same action to wake up device when docked, it
should enable double tap sensor even though the setting is off.
The miss-touch can be ignored when docked.
Bug: 123057133
Test: atest SystemUITests
Change-Id: I67dec8b3ae51f46c50570eaec0250c1aa1dc8bb9
2019-01-22 20:27:57 +08:00
Rubin Xu
259732a8d7
Fix dpm force-network-logs
...
A new permission check in AlarmManager means that we need to clear caller
identity before calling into mNetworkLogger.forceBatchFinalization to
force network logs.
Bug: 123028500
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: I62a9473fa4ec5493a3db4fdad3469e46737fadc0
2019-01-22 12:17:44 +00:00
Remi NGUYEN VAN
111e1c35e3
Migrate ICaptivePortal to stable AIDL
...
Also add required API for the captive portal app to stop using hidden
members.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-22 21:16:47 +09:00
vichang
0edc25693b
Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee60 am: 7f9c43a01e
...
am: d4a58e4a9a
2019-01-22 04:13:20 -08:00
Jorim Jaggi
3ebfb65077
Merge "Introduce new window insets launch flag"
2019-01-22 11:56:44 +00:00
Android Build Merger (Role)
0f1aa7f440
Merge "Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: 563c545187 am: 4293455fd1"
2019-01-22 11:54:58 +00:00
Remi NGUYEN VAN
0a0dc38d8a
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: 563c545187
...
am: 4293455fd1
2019-01-22 03:54:23 -08:00
