Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
355,559 Commits 3 Branches 0 Tags
82c2173b678ebff8092ec2a77eaaf4c987e109bd
Commit Graph

355559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
82c2173b67 Merge "Statsd always includes snapshot of uid map." 2018-01-24 22:31:24 +00:00
Jorim Jaggi
6d2b351791 Merge "Fix NPE from refactoring" 2018-01-24 22:15:36 +00:00
Kweku Adams
1a7bc24fd8 Removing JobStorePersistStats STOPSHIP comment. 
The linked bug is fixed.

Bug: 64536115
Test: N/A
Change-Id: Ic89b2d9b24b88459058c304e08f3f5c8de974081
 2018-01-24 22:14:48 +00:00
Jaewan Kim
aecd38757b Merge "MediaSession2: Last changes before API unhide" 2018-01-24 22:12:04 +00:00
TreeHugger Robot
6af87a9513 Merge "Fix inconsistent MagnificationGestureHandler state after delegation" 2018-01-24 22:09:24 +00:00
TreeHugger Robot
4ca5e2cd2b Merge "Add deep link to the assisted dialing settings." 2018-01-24 22:08:22 +00:00
TreeHugger Robot
ab802003b9 Merge "Compute full text layout in MeasuredText and use it for drawing" 2018-01-24 22:07:13 +00:00
TreeHugger Robot
3741b3499f Merge "[QS] Update night light time from 24 to 12-hr" 2018-01-24 22:04:09 +00:00
John Reck
6e618d6034 Merge "Limit ripple alpha to 50%" 2018-01-24 21:51:06 +00:00
TreeHugger Robot
8b4e2ddc41 Merge "Slider always represents absolute brightness" 2018-01-24 21:45:07 +00:00
TreeHugger Robot
5c7ab895af Merge "Update font config name." 2018-01-24 21:43:24 +00:00
TreeHugger Robot
e012e7a331 Merge "Fix location INTERACT_ACROSS_USERS bug" 2018-01-24 21:39:35 +00:00
TreeHugger Robot
61aa7eeda9 Merge "Adding comment to alarmmanagerservice.proto." 2018-01-24 21:19:18 +00:00
TreeHugger Robot
bdd460bf49 Merge "Remove unused argument LayoutOverhang" 2018-01-24 21:07:21 +00:00
Evan Laird
df598a67d1 Merge "Add status bar icons to QQS" 2018-01-24 21:06:37 +00:00
TreeHugger Robot
edf9ab2b4a Merge "DND qs tile primary text is always Do not disturb" 2018-01-24 20:45:52 +00:00
Andy Hung
c4d2827c96 Merge "AudioSystem: Inform AudioFlinger of total memory" 2018-01-24 20:28:46 +00:00
TreeHugger Robot
1149a4df69 Merge "Fingerprint data is now stored in one of two ways depending on the" 2018-01-24 20:24:22 +00:00
Antoan Angelov
2a5a43d61c Merge changes from topic "dpc-migration-atomic" 
* changes:
  Notify DO after PO ownership transfer when they belong to affiliated users.
  Tests for owner transfer atomicity.
  Make owner transfer an atomic operation.
 2018-01-24 20:11:54 +00:00
Vladislav Kuzkokov
f4e01170b8 Merge "Fix Printing policy in profile owner." 2018-01-24 20:11:31 +00:00
Benedict Wong
96c73a3c40 Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50 am: 02d6d81006 
am: 3b181e9ef7

Change-Id: I998d44bac0993a8f2e9e228a0b0a80adfaa4d87e
 2018-01-24 20:07:20 +00:00
TreeHugger Robot
dbcb0a355e Merge changes I204d0ba7,Ifc51143b,I4b15fac9 
* changes:
  Show swipe up onboarding after 2 apps instead of 3
  Change swipe up onboarding color based on nav bar color
  Add swipe up onboarding from apps
 2018-01-24 20:02:47 +00:00
Android Build Merger (Role)
3a1d3451c0 Merge "Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am: 0aafefb113 am: a8505da2a6 am: 82a6cf1597" 2018-01-24 19:59:42 +00:00
Jaewan Kim
04de5de9a0 MediaSession2: Last changes before API unhide 
This CL includes
- Rename SessionToken to SessionToken2
- Add repeat/shuffle mode support in PlaylistParam
- Add Executor params in session builder
- Add more APIs for MediaPlayerBase

Test: Run all MediaComponents tests once
Change-Id: Ia61632b7a09fab7f41fd89e9489a01af13d6c3c2
 2018-01-25 04:59:05 +09:00
Jack He
a314014c45 Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am: 0aafefb113 am: a8505da2a6 
am: 82a6cf1597

Change-Id: Ibb358a8270867752ce834429f914db21ec1c4c7d
 2018-01-24 19:58:35 +00:00
Jaewan Kim
1252c015a5 Merge "Change MediaControlView2 APIs" 2018-01-24 19:58:02 +00:00
Benedict Wong
3b181e9ef7 Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50 
am: 02d6d81006

Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
 2018-01-24 19:56:24 +00:00
TreeHugger Robot
3f9a1a5426 Merge "Fix deadlock for write-disk cmd." 2018-01-24 19:51:22 +00:00
Jack He
82a6cf1597 Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am: 0aafefb113 
am: a8505da2a6

Change-Id: Iafb904bef6c99f4c48ca9c2ef33ea4809924a4c1
 2018-01-24 19:50:46 +00:00
Benedict Wong
02d6d81006 Merge "Add tunnel-mode calls to netd in IpSecService" 
am: 475fe28c50

Change-Id: I60bd2cd453b8ea7b5a0fb5eb0b59e8a9fe8f57cb
 2018-01-24 19:48:26 +00:00
Siyamed Sinir
4e2b139b82 Merge "Revert "Make ellipsize retry if text doesn't fit"" 2018-01-24 19:45:03 +00:00
Siddharth Ray
21037e95e2 Merge "GPS power calculation" 2018-01-24 19:43:25 +00:00
Jack He
a8505da2a6 Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" 
am: 0aafefb113

Change-Id: I3cb4f7ecbdafaccb40c9e9c7f791d4786583bd56
 2018-01-24 19:42:36 +00:00
Eric Erfanian
5ff756e6c8 Add deep link to the assisted dialing settings. 
This enables clients to reference the setting directly.

Test: none
Bug: 72162646
Change-Id: I58ccfa41e2fd4a6260fe4510fbbcd6067cd0d61f
 2018-01-24 11:37:52 -08:00
TreeHugger Robot
0dea6c9eab Merge "Turn off ambient settings when DISALLOW_AMBIENT_DISPLAY is set." 2018-01-24 19:36:18 +00:00
arangelov
b46faf35c8 Notify DO after PO ownership transfer when they belong to affiliated users. 
Test: Locally modified TransferDPC to print the callback after manually setting DO, PO and then transfering PO owner.
Bug: 72218214
Change-Id: I6c9af00bcfa703c81d9d5b35fe534c928991ff93
 2018-01-24 19:20:37 +00:00
arangelov
08d534b6fd Tests for owner transfer atomicity. 
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.TransferOwnershipMetadataManagerTest
Test: runtest -x
frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/OwnerTransferParamsManagerTest.java
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_noMetadataFile
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceMigrated
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_deviceNotMigrated
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceNotMigrated
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_noMetadataFile
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileMigrated
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_profileNotMigrated
Test: bit
FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileNotMigrated
Bug: 69543005

Change-Id: I2f0153819346cf5be8e5f966627e9cc7e8dba190
 2018-01-24 19:20:36 +00:00
arangelov
91201bdbca Make owner transfer an atomic operation. 
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.TransferOwnershipMetadataManagerTest
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/OwnerTransferParamsManagerTest.java
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_noMetadataFile
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_deviceNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_noMetadataFile
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_profileNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileNotMigrated
Bug: 69543005

(cherry picked from commit 5a6d391dedcdec13fcc4cf1770e7bf9fc1be8643)

Change-Id: Ic2d729d48fdb47b0ebd60030b45615b0cec174a2
 2018-01-24 19:20:36 +00:00
Rohan Shah
d3aa56c14f [QS] Update night light time from 24 to 12-hr 
Fixing a small typo (capitalization) in the date time pattern for the
formatter. This'll fix the time format for the night light's secondary
label.

Test: visual
Bug: 69973398
Change-Id: I1fd48b33e140bb3b6e0587be89e10297d036aa2a
 2018-01-24 11:17:39 -08:00
Maggie
9ebcf05596 Fix location INTERACT_ACROSS_USERS bug 
Use UserHandle.getCallingUserId in LocationManager.isProviderEnabled

Bug: 72430849
Test: Manual
Change-Id: I1ddfc4fd308889b1f2247df038d22e2f7b08da74
 2018-01-24 11:01:20 -08:00
TreeHugger Robot
ff73b83831 Merge changes Ia3065eb5,I602e8bb0 
* changes:
  Update ProgramInfo to match HAL 2.0 changes.
  Implement front-end APIs for announcements.
 2018-01-24 19:00:39 +00:00
Calin Juravle
5673793a5f Merge "[framework] Prepare profile for app code paths" 2018-01-24 18:45:00 +00:00
TreeHugger Robot
9ada8e42e2 Merge "Make the quick scrub track smaller to reach the right easier" 2018-01-24 18:42:33 +00:00
David Brazdil
c5e55b4840 Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" 2018-01-24 18:41:39 +00:00
TreeHugger Robot
18ef0d5bef Merge "Use proper logic operators in package name validation" 2018-01-24 18:38:44 +00:00
Felipe Leme
e53c1a1b6b Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev am: 5e687224bd 
am: 2418109cf1

Change-Id: I3d8b0e3b785d8427dc6bca9168e7a4b7553cb22f
 2018-01-24 18:31:55 +00:00
Kweku Adams
f2e67df453 Adding comment to alarmmanagerservice.proto. 
Bug: 70621331
Test: N/A
Change-Id: I471a7d2084cf60be8a22753139dfbcfeb001617f
 2018-01-24 18:27:20 +00:00
Felipe Leme
2418109cf1 Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev 
am: 5e687224bd

Change-Id: I23817abcefde8700c101b756ee6a39d153ea7af5
 2018-01-24 18:23:48 +00:00
Daniel Nishi
1da5ab0183 Merge "Add a new setting for Bluetooth on while driving." 2018-01-24 18:22:15 +00:00
TreeHugger Robot
41584b69fd Merge "Update crash dialog options." 2018-01-24 18:21:54 +00:00