Commit Graph

400509 Commits

Author SHA1 Message Date
Roshan Pius
6402e56c4a WifiManager: Mark disableEphemeralNetwork as @hide
This is only used by settings, so no need to make it @SystemApi.
Removing the @SystemApi tag which was unnecessarily added in ag/5529624.

Bug: 122278104
Test: make system-api-stubs-docs-update-current-api
Change-Id: I74a67abdc5e1ed2f2f049e560a3e6f8a1d0e8d76
2019-01-22 11:07:23 -08:00
Daniel Solomon
6d6c5dac85 Merge "Clear display white balance transform when disabled" 2019-01-22 18:59:29 +00:00
Mady Mellor
9c79041cc6 Merge "Fix layout crash & bubble anything with valid bubble metadata intent" 2019-01-22 18:44:38 +00:00
TreeHugger Robot
065aac1a1e Merge "Support for multi-package apex sessions." 2019-01-22 18:21:07 +00:00
TreeHugger Robot
a7b0f93991 Merge "Fix the xml parsing of multi-package sessions." 2019-01-22 18:21:07 +00:00
TreeHugger Robot
a0602f3eba Merge "Move plugin and settings logic out of KeyguardClockSwitch." 2019-01-22 18:21:01 +00:00
Yohei Yukawa
46d74762f3 Simplify IMMS#calledFromValidUserLocked()
With my previous CL [1], IMMS#calledFromValidUserLocked() now always
gets called with the same parameter.  Let's simplify it.

This is a mechanical refactoring.  There should be no behavior change.

 [1]: Ieb94ed14698ee2669adc5fb2ea0e93c7d0e09e8b
      716897ce2e

Bug: 34886274
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I571db5a648ddf8b35caad3d3b64549b7cc067d14
2019-01-22 10:17:22 -08:00
Alex Salo
1e84afbac2 Merge "Add ADAPTIVE_SLEEP setting" 2019-01-22 18:10:44 +00:00
TreeHugger Robot
9e10c87914 Merge "passpoint-r2: change the name for OSU_FAILURE_INVALID_SERVER_URL." 2019-01-22 18:07:23 +00:00
TreeHugger Robot
839ee8df87 Merge "meminfo: Debug: Use libmeminfo to read process maps" 2019-01-22 18:00:42 +00:00
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

Change-Id: I8e716337b30fa802a5b07f8f16421ad3a499720e
2019-01-22 09:32:14 -08:00
Tobias Thierer
37db9722a6 Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c
am: 6804819923

Change-Id: Ib92af4ccfb66dc2bf261eb474d54e913bbcd96d8
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

Change-Id: I30dafbd9577dbaced7712b7497ecb0e0324c75f5
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
Robert Snoeberger
15b4af1943 Move plugin and settings logic out of KeyguardClockSwitch.
This is in preparation for adding more logic related to docked state.

Bug: 122301289
Test: Used adb to switch between custom clock faces.
Change-Id: I0a13ef4e5894df1280a04c5a9df8bbed8054557b
2019-01-22 11:32:40 -05:00
Dario Freni
015f935191 Support for multi-package apex sessions.
If we have multi-package sessions, we check whether they contain APEX
packages and proceed with the pre-reboot verification of the whole
session. Session is then applied by apexd on reboot, and the state is
recovered and updated by StagingManager as soon as the sessions are
restored.

Bug: 118865310
Test: adb install-multi-package file1.apex file2.apex; verified sessions
are written correctly, restored correctly on stop/start, applied
correctly at reboot and their state is updated.
Test: atest apex_e2e_tests (to make sure we didn't regress)
Change-Id: Ia31d5badace016074d158e31c574fbad81576984
2019-01-22 16:22:23 +00:00
Dario Freni
a6f1128e09 Fix the xml parsing of multi-package sessions.
The existing code didn't restore the child sessions, since the
XmlPullParser object was advanced within the
PackageInstallerSession#readFromXml code (in order to read grant
permissions).

Slightly refactor the code to make it more self-contained and testable,
and adding a test to make sure that the most important bits of a
session, or of a group of sessions, are dumped and restored properly.

Bug: 118865310
Bug: 109941548
Test: atest FrameworksServicesTests:PackageInstallerSessionTest;
verified that install_sessions.xml is correctly written and restored in
presence of multi-group sessions.
Change-Id: I5aef61f64e7223844f11661ee068dd3c1e112611
2019-01-22 15:58:42 +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

Change-Id: I7ab00c1b82858014fb3135474a64a9fa44d8283b
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

Change-Id: I5af4c4591cd825adfeab8be56d7c60d29905f1c4
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

Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e
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

Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
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

Change-Id: Ic9de1989c156a1dd111465c20d84bd1c7c37e69f
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

Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04
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

Change-Id: I4156471eec78511fd86a1c381d53df57b1f4ea98
2019-01-22 06:13:46 -08:00
Remi NGUYEN VAN
f10038e9ca Merge "Expose UIDs for NetworkStack permission checks" am: 3b887bdf4a
am: 29515d751b

Change-Id: Ia9bc41cebf048d536efa8aeea992fed3f583ba1b
2019-01-22 06:04:32 -08:00
Remi NGUYEN VAN
29515d751b Merge "Expose UIDs for NetworkStack permission checks"
am: 3b887bdf4a

Change-Id: I893fbd359e9d5e7731e3b640b86ec9dd05b829f3
2019-01-22 05:53:20 -08:00
Remi NGUYEN VAN
75df50dc83 Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27 am: b6eb7e19e2
am: f012b976f9

Change-Id: I7916f77c66d928bd1b1dd5616f2a478119263f2a
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

Change-Id: I432d8f625057a3e3e35e12910fc48319c723295e
2019-01-22 05:34:33 -08:00
Remi NGUYEN VAN
b809148b9a Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a am: 8e4ce11318
am: c904972acd

Change-Id: Idcc18b95951c566335431a493ed7b9d49477a4c0
2019-01-22 05:32:01 -08:00
Remi NGUYEN VAN
b6eb7e19e2 Merge "Remove InterfaceController dependency on NMS"
am: 06adb08d27

Change-Id: I24c129d143f49434c126855dd90f7a0436d00ca5
2019-01-22 05:25:12 -08:00
Remi NGUYEN VAN
c904972acd Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a
am: 8e4ce11318

Change-Id: I33fc6ee4cf47676dc2a4a9369dd3fc053dba34ec
2019-01-22 05:22:30 -08:00
Remi NGUYEN VAN
8e4ce11318 Merge changes Ieef54d84,Ica3e88c2
am: 491f53523a

Change-Id: Ia60c1dd733a8de0e777dce78cde67738f6d466bd
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

Change-Id: I84effb70b0bbea0e57d5982105fc304080e504ac
2019-01-22 05:11:38 -08:00