Commit Graph

99340 Commits

Author SHA1 Message Date
Jeff Sharkey
bb09ee38bc Merge "Adjustments after moving MediaStore inside APEX." 2019-12-20 21:02:55 +00:00
Jeff Sharkey
1fec28066f Adjustments after moving MediaStore inside APEX.
The "core_platform" SDK technically includes non-stable APIs, so we
need to shift to "core_current" instead.

While we're here, tidy up some older @removed APIs that never shipped
and replace HexEncoding with a local implementation.

Since MediaProvider itself is free to use @hide APIs from its own
framework code in MediaStore.java, we can include all sources
from "framework-mediaprovider-sources" directly.

Also since the "framework-annotations" filegroup in Android.bp is
a very limited subset of leaf source code, it can't directly
reference Intent, so adjust the javadoc so we can drop the "import."

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I198d84a755b5e270a19b41328f6a6e152112c40a
2019-12-20 13:52:40 -07:00
TreeHugger Robot
6f28d5e616 Merge "Migrating Incremental* APIs to PackageManager APIs." 2019-12-20 19:44:43 +00:00
Winson Chung
afbe32079a Merge "Clean up remote animation definitions when activity is destroyed" 2019-12-20 17:52:36 +00:00
Lucas Dupin
5465b18518 Merge "Enable WCG support for ImageWallpaper" 2019-12-20 17:28:49 +00:00
Alex Buynytskyy
1ecfcece45 Migrating Incremental* APIs to PackageManager APIs.
Step 2, merging Data Loader params.

Test: builds and flashes
Bug: b/136132412

Change-Id: I2102554316dadcdcb49790c133ece110c43c29b3
2019-12-20 06:55:32 -08:00
Mark Chien
ebc76bc2e9 Merge "[Tether13] Move TetheringManager into framework" 2019-12-20 05:04:08 +00:00
JW Wang
0bb6808121 Add rollback data policy (1/n)
1. Do the plumbing to pass the data policy all the way to
   SessionInfo.
2. SessionInfo#rollbackDataPolicy will be used by RollbackManager to
   determine whether to wipe user data when enabling/committing
   rollback.

Bug: 144683152
Test: atest RollbackStoreTest RollbackUnitTest AppDataRollbackHelperTest
Test: atest RollbackTest StagedRollbackTest

Change-Id: Ie1e5457d0304f9cf8fc34fce17d707be75407a2b
2019-12-20 04:05:01 +00:00
Etan Cohen
195a4f72c6 Merge "[WIFICOND] Formalize the wificond AIDL interface" 2019-12-20 03:58:10 +00:00
TreeHugger Robot
741a368bb0 Merge "Move ImsManager registery to TelephonyFrameworkInitializer" 2019-12-20 03:54:42 +00:00
Automerger Merge Worker
43b5abeec2 Merge "Provide APIs to get preferred payment service information" am: c0c28a2671 am: e7bfadcb7d am: b70662d510
Change-Id: I3518a47aaa544962e52b12db3a01fc55802a9faf
2019-12-20 03:39:40 +00:00
Automerger Merge Worker
b70662d510 Merge "Provide APIs to get preferred payment service information" am: c0c28a2671 am: e7bfadcb7d
Change-Id: I6594c36891f2f4f644ee1d154989465459752ef0
2019-12-20 03:25:38 +00:00
Jack Yu
e7bfadcb7d Merge "Provide APIs to get preferred payment service information"
am: c0c28a2671

Change-Id: I632a657c5342fbc4f30aae515b842a66c0ad6abd
2019-12-19 19:10:35 -08:00
Treehugger Robot
c0c28a2671 Merge "Provide APIs to get preferred payment service information" 2019-12-20 03:05:13 +00:00
Philip P. Moltmann
baa2cea8c3 Merge changes from topic "RefactorAppOpAccessCounters"
* changes:
  Encapusale running app-ops in an object
  Refactor app-op access/reject counters
2019-12-20 03:04:55 +00:00
TreeHugger Robot
724e336f4d Merge "[incremental/dataloader] make some class and methods system APIs" 2019-12-20 02:34:40 +00:00
markchien
ae8aa646dc [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-20 10:31:31 +08:00
Automerger Merge Worker
780c265406 Merge "Do not setSubId on SmsMessage." am: 0330797929 am: 50080aa1ae am: a9a1cc68f7
Change-Id: I2be56203df91f1611b6276c22b1d7a9c380bf0b9
2019-12-20 02:30:26 +00:00
Automerger Merge Worker
6af4789825 Merge "Add an API to tell whenever device supports userspace reboot" am: 670352e807 am: d1c0e074c0 am: 0b11673991
Change-Id: I797923d568645425aca0659d02cd8dc0364a25ff
2019-12-20 02:27:51 +00:00
Automerger Merge Worker
91bc7be712 Merge "Use sysprop library for telephony props" am: afb16fa9d4 am: dc4de88fec
Change-Id: Iae5ca6c30dd3a72d5da921cf45d9c282bcff2703
2019-12-20 02:22:19 +00:00
Inseob Kim
dc4de88fec Merge "Use sysprop library for telephony props"
am: afb16fa9d4

Change-Id: Ieeb580cd47e4210c9cb9edea4a0b561b73420040
2019-12-19 18:03:38 -08:00
Treehugger Robot
afb16fa9d4 Merge "Use sysprop library for telephony props" 2019-12-20 02:00:38 +00:00
Jeff Sharkey
1e89d231a9 Merge "Move MediaStore.java inside APEX boundary." 2019-12-20 01:17:45 +00:00
Eugene Susla
5fd6266552 Merge "[CDM] Bypass location setting when scanning for devices" 2019-12-20 00:58:57 +00:00
Noah Zimmt
2115c17ced Merge "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn" into qt-qpr1-dev-plus-aosp 2019-12-20 00:45:42 +00:00
Noah Zimmt
d80dc8fed4 [DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=6087936&lkbb=6087980&fkbb=6087980, b/146588413
Reverted Changes:
I8445808a0: Expose PreciseDataConnectionState to Public API
Ib6a769f5a: Expose PreciseDataConnectionState to Public API

Note: These CLs are correctly applied in master already.
      The revert should merge to qt-qpr1-dev-plus-aosp only
Change-Id: If98f8ba5f20073bade40f7b167ed185c2e4c0e1b
2019-12-20 00:43:41 +00:00
Automerger Merge Worker
a9a1cc68f7 Merge "Do not setSubId on SmsMessage." am: 0330797929 am: 50080aa1ae
Change-Id: I2f08915cb59ae1999922ca4bc874b9d1903fc053
2019-12-20 00:26:55 +00:00
Automerger Merge Worker
0b11673991 Merge "Add an API to tell whenever device supports userspace reboot" am: 670352e807 am: d1c0e074c0
Change-Id: I5e51be225c3063e250facec51cf4976c3004acc4
2019-12-20 00:26:24 +00:00
Automerger Merge Worker
402f7eb3fb Merge "Use write_buffer_to_statsd within StatsLog_write" am: 634f6969c4 am: 4f32e393d0
Change-Id: Ie91b0cceab48051c53f8e7270a5a267c5778a82d
2019-12-20 00:24:50 +00:00
Songchun Fan
4062c3ca67 [incremental/dataloader] make some class and methods system APIs
These are the APIs that are needed for Incremental installations
initiated by privileged apps.

Only for internal development of Incremental.

BUG: 136132412
Test: m IncrementalScenarioTests
Change-Id: I258979df03943417f2a896160374f2f73841b733
2019-12-19 16:23:58 -08:00
Meng Wang
50080aa1ae Merge "Do not setSubId on SmsMessage."
am: 0330797929

Change-Id: I7b7eb6c747ce7e9f82f0125519a6bc2fafaa3ef2
2019-12-19 16:19:24 -08:00
Jayachandran C
e80ab40f70 Move ImsManager registery to TelephonyFrameworkInitializer
Bug: 140768340
Test: Build
Change-Id: I299fea193a157ce4c4b073a4b804739c7e4ba400
2019-12-19 16:13:46 -08:00
Nikita Ioffe
d1c0e074c0 Merge "Add an API to tell whenever device supports userspace reboot"
am: 670352e807

Change-Id: I6706acb0d2d396b1870813e692c3124da92e4b7f
2019-12-19 16:11:37 -08:00
Mikhail Naganov
8dfb438b52 Merge "Add audio stream and usage for virtual assistant" 2019-12-20 00:08:22 +00:00
Muhammad Qureshi
4f32e393d0 Merge "Use write_buffer_to_statsd within StatsLog_write"
am: 634f6969c4

Change-Id: Iddc845d267e8bd5b54bd95caa184fb27bbdab606
2019-12-19 16:04:27 -08:00
Meng Wang
0330797929 Merge "Do not setSubId on SmsMessage." 2019-12-19 23:47:22 +00:00
Nikita Ioffe
670352e807 Merge "Add an API to tell whenever device supports userspace reboot" 2019-12-19 23:44:06 +00:00
Nathan Harold
be34c7019a Merge "Expose PreciseDataConnectionState to Public API" into qt-qpr1-dev-plus-aosp 2019-12-19 23:40:18 +00:00
Treehugger Robot
634f6969c4 Merge "Use write_buffer_to_statsd within StatsLog_write" 2019-12-19 23:31:48 +00:00
Philip P. Moltmann
6c6403e395 Encapusale running app-ops in an object
... instead of having some counters.

Also:
- No need to store token/clientId in system server
- startOP/finishOp does not require a featureId, null is ok.

Fixes: 144997947
Change-Id: Ic955cb2686f3d53b957d816397e978a80cf4d29b
2019-12-19 15:14:57 -08:00
Winson Chung
10fc25dadd Clean up remote animation definitions when activity is destroyed
- Remove the remote animation definition when the associated process dies
- Also expose method to unregister any registered animation defs

Bug: 139137636
Test: Kill launcher, ensure the remote animation ref is removed
Change-Id: Ia38d037397703221c17c8258ec1a245055d5896d
2019-12-19 15:01:50 -08:00
TreeHugger Robot
f8a45ea20d Merge "Add R scoped storage app-ops" 2019-12-19 22:56:54 +00:00
Automerger Merge Worker
4ae6995e92 Merge "Introduce telecom api to launch emeregency dialer." am: c55310438b am: 52432f5737
Change-Id: Ibb17c03a6c43bd654f36705cdac093b94fea9c16
2019-12-19 22:48:28 +00:00
Hongwei Wang
41df8e465c Merge "Move rotation bounds calculation into SysUI" 2019-12-19 22:19:49 +00:00
Jeff Sharkey
40182833f7 Move MediaStore.java inside APEX boundary.
Recent work has paved the way to get MediaStore.java building against
"core_platform", and this change is actually shifting MediaStore.java
inside the MediaProvider APEX boundary.

This involves defining a new "updatable-mediaprovider" library JAR
and ensuring that it's spliced into classpaths where needed to keep
everything building and working.

Note that the MediaProvider APK itself is still bundled, so we're
manually including the MediaStore.java when building that APK so that
we can continue referencing @hide symbols, but there's a STOPSHIP
comment to remove that once we get the APK building against
"system_current".

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I27ed3fde40751d9ac136a31710c62004b1b8962f
2019-12-19 22:16:00 +00:00
Meng Wang
b3b63b67ac Do not setSubId on SmsMessage.
subId is not used anywhere.

Bug: 140908357
Test: make
Change-Id: I8d1786a8aa5f47886d0127a8009b1312e6d3010e
2019-12-19 14:13:12 -08:00
Fan Zhang
52432f5737 Merge "Introduce telecom api to launch emeregency dialer."
am: c55310438b

Change-Id: I2b4d4d6b160afab0e97600b057367b2b889a795a
2019-12-19 14:12:36 -08:00
Fan Zhang
c55310438b Merge "Introduce telecom api to launch emeregency dialer." 2019-12-19 22:07:42 +00:00
Evan Severson
7f1ce8f903 Merge "Create system server component for one-time permissions" 2019-12-19 22:04:40 +00:00
Automerger Merge Worker
cc628869ff Merge changes from topic "ion memory accounting" am: 5ded8c130c am: 3c4624dcc2
Change-Id: I6620e200357ddcc46557f149e17fcad25e7c57c4
2019-12-19 21:51:13 +00:00