Commit Graph

401606 Commits

Author SHA1 Message Date
TreeHugger Robot
4fcdce138f Merge "Hide new ColorSpace APIs" 2019-01-27 01:07:13 +00:00
Yu-Han Yang
ab8fa44765 Merge "Add yuhany@ and aadmal@ to OWNERS" am: 223d681503 am: f4fcb2fde2
am: 1b52797fbe

Change-Id: I3c46a08c0eb762a4f4fa35d13241b57a72ae5260
2019-01-26 16:45:39 -08:00
Yu-Han Yang
1b52797fbe Merge "Add yuhany@ and aadmal@ to OWNERS" am: 223d681503
am: f4fcb2fde2

Change-Id: Iec8b42c25146a1444ef2c5e5d3b30877922307a9
2019-01-26 16:35:13 -08:00
TreeHugger Robot
edd6bc5bd9 Merge "Fix hardware protected path for SDK ImageReader." 2019-01-27 00:29:28 +00:00
Yu-Han Yang
f4fcb2fde2 Merge "Add yuhany@ and aadmal@ to OWNERS"
am: 223d681503

Change-Id: Ibf7c18fc2936bc0b854b914f41e41966a4485466
2019-01-26 16:25:12 -08:00
TreeHugger Robot
3cf44ca734 Merge "Amend flagFlipUpdateOccurred atom" 2019-01-27 00:12:28 +00:00
Treehugger Robot
223d681503 Merge "Add yuhany@ and aadmal@ to OWNERS" 2019-01-27 00:08:17 +00:00
Peiyong Lin
b20446f6bd Merge "Add Display.getPreferredWideGamutColorSpace()." 2019-01-26 22:10:16 +00:00
Peiyong Lin
9934adcaa5 Merge "Eliminate the usage of ConfigStore." 2019-01-26 22:09:13 +00:00
Joe Onorato
c2178a0f3a Merge "[bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition" 2019-01-26 19:24:44 +00:00
Joe Onorato
8581ac1457 Merge "[bit] Cache the build variables so we don't have to run make to figure them out unless the environment has changed." 2019-01-26 19:22:03 +00:00
Hongming Jin
7f921d7df8 Merge "Add API to SmsManager to allow apps to authenticate user account through sms without requesting sms permissions." 2019-01-26 19:19:18 +00:00
Joe Onorato
70edfa8c31 [bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition
Test: bit services
Change-Id: I7d44ffbb2745b1a6265bbc77f24f885e5f1d3981
2019-01-26 09:48:40 -08:00
Joe Onorato
ce0bd06d17 [bit] Cache the build variables so we don't have to run make to figure them out unless the environment has changed.
Test: bit GooglePermissionControllerTest:*
Change-Id: Ie79226026477df22115ed1146875b82c2255bdef
2019-01-26 09:48:25 -08:00
Soonil Nagarkar
3b69cbef4e Merge "Fix potential deadlock in ServiceWatcher" 2019-01-26 16:39:28 +00:00
Richard Uhler
efb4132ba3 Merge changes Ic2bb4798,I2a409de2,I88a50a0e,Ia69342a4,Ia6548e4d, ...
* changes:
  Use "commit" instead of "execute" for rollbacks.
  Rename PACKAGE_ROLLBACK_EXECUTED to ROLLBACK_COMMITTED.
  Remove unused RollbackManager APIs.
  Use RollbackManager.getAvailableRollbacks in RollbackTest
  Use new RollbackManager API in RollbackPackageHealthObserver.
  Add RollbackManager.getAvailableRollbacks API.
  Include all relevant packages in RollbackInfo.
2019-01-26 07:31:28 +00:00
Kevin Chyn
71ae5ba4c9 Merge changes from topics "cc-implicit-2", "cc-implicit"
* changes:
  Deprecate CC and add BP#buildIntent()
  Revert "Add plumbing for setRequireConfirmation to CC"
2019-01-26 04:27:00 +00:00
TreeHugger Robot
18bac4c2da Merge "Support multi-ABI in tests." 2019-01-26 04:19:41 +00:00
TreeHugger Robot
7e88e4ceb6 Merge "Remove RuntimePermPresSvc#onRevokeRuntimePerm" 2019-01-26 04:09:32 +00:00
TreeHugger Robot
08f1ef2d15 Merge "Hide distracting pkg notifications" 2019-01-26 03:57:13 +00:00
TreeHugger Robot
b1a29f15f1 Merge "Add closing div tag for ContentResolver javadoc" 2019-01-26 02:21:44 +00:00
Nick Kralevich
831cf61d80 Merge "more O_CLOEXEC" am: 350f48328b am: 51aec2267c
am: 8d26cdbd34

Change-Id: I2624180a9284beced0677de070b600c21fa24ae6
2019-01-25 18:10:33 -08:00
Kevin Chyn
1b2137cf42 Deprecate CC and add BP#buildIntent()
To ensure future BP builder changes don't require a 1:1 addition to the
CC API, we're deprecating CC and moving the API to BP.

Since CDC is an activity, and BP can't receive onActivityResult from CDC,
we need to have BiometricService launch CDC. CDC will return auth/reject
results to BiometricService using a private protected aidl method, which
can then forward the reuslt to BP/app.

Bug: 111461540

Test: builds
Test: demo app, receives correct callbacks

Change-Id: I7111ca2842534a596302fe0eb7338fbfaca72eec
2019-01-25 18:09:03 -08:00
Nick Kralevich
8d26cdbd34 Merge "more O_CLOEXEC" am: 350f48328b
am: 51aec2267c

Change-Id: I36d95d214a9b07c474b8a8c5fdb6dbf15c4cf535
2019-01-25 18:02:23 -08:00
Nick Kralevich
51aec2267c Merge "more O_CLOEXEC"
am: 350f48328b

Change-Id: I14c8a19b241e29ad4a9bd74d8ed904aa2ef7e5b3
2019-01-25 17:51:51 -08:00
Kevin Chyn
6a2121763c Revert "Add plumbing for setRequireConfirmation to CC"
This reverts commit d75a03b722.

Reason for revert: Adding functionality differently

Change-Id: I90ac64c89566589797f1ad0bf69fefee3fbd04e1
2019-01-25 17:49:14 -08:00
Kevin Chyn
97bd994bb0 Merge "Add additional acquired constants" 2019-01-26 01:47:06 +00:00
Treehugger Robot
350f48328b Merge "more O_CLOEXEC" 2019-01-26 01:32:15 +00:00
Yohei Yukawa
15be5e6f1c Take CLONE_TO_MANAGED_PROFILE into account in InputMethodSettings
This is a preparation to clone SHOW_IME_WITH_HARD_KEYBOARD to profile
users.

With this CL, InputMethodSettings takes CLONE_TO_MANAGED_PROFILE into
account when writing secure settings.  The point is that when a secure
settings key is in Settings.Secure.CLONE_TO_MANAGED_PROFILE, the value
needs to be written into the profile parent's settings, not the
current user's one.  In this way, InputMethodSettings doesn't need to
be updated when a new entry is added to / removed from
CLONE_TO_MANAGED_PROFILE.

This CL does not change Settings.Secure.CLONE_TO_MANAGED_PROFILE hence
there should be no behavior change.

Bug: 123379418
Test: make -j checkbuild
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Ieefefb8630ddef3b247ebb865a604e5c72dfb49c
2019-01-25 17:27:03 -08:00
Peiyong Lin
277eaff438 Add Display.getPreferredWideGamutColorSpace().
Add Display.getPreferredWideGamutColorSpace() to return the preferred wide
color space that the rendering and composition pipeline prefers.

BUG: 120904891
Test: atest android.display.cts.DisplayTest#testGetPreferredWideGamutColorSpace
Change-Id: I1bcd9db72689a734b2a7c097b99a01464810994a
2019-01-25 17:15:26 -08:00
Steven Moreland
e6e4b95341 Merge "framework.jar: Include all radio HIDL libs." 2019-01-26 00:52:39 +00:00
Soonil Nagarkar
192710b578 Fix potential deadlock in ServiceWatcher
Bug: 123363078
Test: manually
Change-Id: I9ac83c37c0c00170f95b505bdac68bb5db6e0283
2019-01-25 16:42:19 -08:00
Daniel Solomon
7d7a498788 Hide new ColorSpace APIs
A previous change added two new public ColorSpace APIs. These APIs are
being used only by ColorDisplayService for specific purposes, so for now
make them hidden.

Bug 116516917

Change-Id: Ib644d356a84d4122173ea4cafbac88bd63b1afcd
2019-01-25 15:43:10 -08:00
Hongming Jin
46edf1506d Add API to SmsManager to allow apps to authenticate user account through
sms without requesting sms permissions.

Bug: 111210542
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: I9b176032d7b2bf578dd1a64745bf4a1e13008a7a
2019-01-25 15:24:29 -08:00
Evan Rosky
2bfd202ec5 Merge changes from topics "sf_task_id", "sf_metadata"
* changes:
  Add task-id to the task-level surface
  Add metadata store to surfaces
2019-01-25 23:15:36 +00:00
Nick Kralevich
351673890c Merge "even more O_CLOEXECs!" am: bb5b645454 am: 6130adad16
am: 8da21b7b21

Change-Id: Ia4e37933ee5742f74e7d58e4eaca71f89954aa00
2019-01-25 15:05:34 -08:00
Nick Kralevich
8da21b7b21 Merge "even more O_CLOEXECs!" am: bb5b645454
am: 6130adad16

Change-Id: Id1538b24d3d213711ad014634071957d5834016f
2019-01-25 14:54:25 -08:00
Nick Kralevich
6130adad16 Merge "even more O_CLOEXECs!"
am: bb5b645454

Change-Id: I8435d69b72dbbbc881bbd43c7a640f3460e5777a
2019-01-25 14:43:37 -08:00
TreeHugger Robot
4e78dec0d8 Merge "Add api to change charging state update delay" 2019-01-25 22:42:06 +00:00
Treehugger Robot
bb5b645454 Merge "even more O_CLOEXECs!" 2019-01-25 22:32:40 +00:00
Jean-Michel Trivi
103a678ac3 Merge "AudioDeviceBroker in audio service" 2019-01-25 22:31:09 +00:00
Mathieu Chartier
23cf99cd29 [automerger skipped] Merge "[view compilation] Add separate compilation property" am: 9343b88b43 am: 84d59ddcf9
am: 9ff145b7f5 -s ours
am skip reason: change_id Ica79ec076714f76d6ae75d398a2f62d7dd85a6a6 with SHA1 9e7a5f6078 is in history

Change-Id: I6167f0e950a9e405f3eaa7a4dc42d57225321cc5
2019-01-25 14:24:48 -08:00
Khushal
65d1941640 Fix hardware protected path for SDK ImageReader.
Ensure IGraphicBufferConsumer is marked protected for ImageReader if
the client requests AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT usage.

BUG: crbug.com/889328
Test: Manual testing.

Change-Id: Ibf898aed08ce6d1030aa8eeb4b240a63c4032058
2019-01-25 14:21:58 -08:00
TreeHugger Robot
50d9a17763 Merge "Add whitelist setting to proto dump util" 2019-01-25 22:16:00 +00:00
Olivier Gaillard
e19f2cf1bd Merge "Add pullers for debugging." 2019-01-25 22:15:33 +00:00
Mathieu Chartier
9ff145b7f5 Merge "[view compilation] Add separate compilation property" am: 9343b88b43
am: 84d59ddcf9

Change-Id: I56ace17117e711fec7adca82d53929a3dd3f4770
2019-01-25 14:14:21 -08:00
Abhijeet Kaur
c5f10b978c Merge "Add e2e tests for getstagedsessions for apex" 2019-01-25 22:08:00 +00:00
Mathieu Chartier
84d59ddcf9 Merge "[view compilation] Add separate compilation property"
am: 9343b88b43

Change-Id: I2944873c615c6278507a39a78a5c0dec2f4104df
2019-01-25 14:05:20 -08:00
TreeHugger Robot
ced0b0c90c Merge "De-duplicate entries written with AAPT2 convert" 2019-01-25 22:03:49 +00:00
Lucas Dupin
cea31af085 Merge "Do not sleep if someone is paying attention" 2019-01-25 21:55:51 +00:00