OSDN Git Service
TreeHugger Robot [Wed, 24 Jan 2018 21:43:24 +0000 (21:43 +0000)]
Merge "Update font config name."
TreeHugger Robot [Wed, 24 Jan 2018 21:39:35 +0000 (21:39 +0000)]
Merge "Fix location INTERACT_ACROSS_USERS bug"
TreeHugger Robot [Wed, 24 Jan 2018 21:19:18 +0000 (21:19 +0000)]
Merge "Adding comment to alarmmanagerservice.proto."
TreeHugger Robot [Wed, 24 Jan 2018 21:07:21 +0000 (21:07 +0000)]
Merge "Remove unused argument LayoutOverhang"
Evan Laird [Wed, 24 Jan 2018 21:06:37 +0000 (21:06 +0000)]
Merge "Add status bar icons to QQS"
TreeHugger Robot [Wed, 24 Jan 2018 20:45:52 +0000 (20:45 +0000)]
Merge "DND qs tile primary text is always Do not disturb"
Andy Hung [Wed, 24 Jan 2018 20:28:46 +0000 (20:28 +0000)]
Merge "AudioSystem: Inform AudioFlinger of total memory"
TreeHugger Robot [Wed, 24 Jan 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Fingerprint data is now stored in one of two ways depending on the"
Antoan Angelov [Wed, 24 Jan 2018 20:11:54 +0000 (20:11 +0000)]
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.
Vladislav Kuzkokov [Wed, 24 Jan 2018 20:11:31 +0000 (20:11 +0000)]
Merge "Fix Printing policy in profile owner."
Benedict Wong [Wed, 24 Jan 2018 20:07:20 +0000 (20:07 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50 am:
02d6d81006
am:
3b181e9ef7
Change-Id: I998d44bac0993a8f2e9e228a0b0a80adfaa4d87e
TreeHugger Robot [Wed, 24 Jan 2018 20:02:47 +0000 (20:02 +0000)]
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
Android Build Merger (Role) [Wed, 24 Jan 2018 19:59:42 +0000 (19:59 +0000)]
Merge "Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113 am:
a8505da2a6 am:
82a6cf1597"
Jack He [Wed, 24 Jan 2018 19:58:35 +0000 (19:58 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113 am:
a8505da2a6
am:
82a6cf1597
Change-Id: Ibb358a8270867752ce834429f914db21ec1c4c7d
Jaewan Kim [Wed, 24 Jan 2018 19:58:02 +0000 (19:58 +0000)]
Merge "Change MediaControlView2 APIs"
Benedict Wong [Wed, 24 Jan 2018 19:56:24 +0000 (19:56 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50
am:
02d6d81006
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
TreeHugger Robot [Wed, 24 Jan 2018 19:51:22 +0000 (19:51 +0000)]
Merge "Fix deadlock for write-disk cmd."
Jack He [Wed, 24 Jan 2018 19:50:46 +0000 (19:50 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113
am:
a8505da2a6
Change-Id: Iafb904bef6c99f4c48ca9c2ef33ea4809924a4c1
Benedict Wong [Wed, 24 Jan 2018 19:48:26 +0000 (19:48 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService"
am:
475fe28c50
Change-Id: I60bd2cd453b8ea7b5a0fb5eb0b59e8a9fe8f57cb
Siyamed Sinir [Wed, 24 Jan 2018 19:45:03 +0000 (19:45 +0000)]
Merge "Revert "Make ellipsize retry if text doesn't fit""
Siddharth Ray [Wed, 24 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "GPS power calculation"
Jack He [Wed, 24 Jan 2018 19:42:36 +0000 (19:42 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"
am:
0aafefb113
Change-Id: I3cb4f7ecbdafaccb40c9e9c7f791d4786583bd56
TreeHugger Robot [Wed, 24 Jan 2018 19:36:18 +0000 (19:36 +0000)]
Merge "Turn off ambient settings when DISALLOW_AMBIENT_DISPLAY is set."
arangelov [Wed, 17 Jan 2018 21:27:40 +0000 (21:27 +0000)]
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
arangelov [Mon, 22 Jan 2018 15:20:53 +0000 (15:20 +0000)]
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
arangelov [Thu, 4 Jan 2018 17:10:21 +0000 (17:10 +0000)]
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
Maggie [Wed, 24 Jan 2018 19:01:20 +0000 (11:01 -0800)]
Fix location INTERACT_ACROSS_USERS bug
Use UserHandle.getCallingUserId in LocationManager.isProviderEnabled
Bug:
72430849
Test: Manual
Change-Id: I1ddfc4fd308889b1f2247df038d22e2f7b08da74
TreeHugger Robot [Wed, 24 Jan 2018 19:00:39 +0000 (19:00 +0000)]
Merge changes Ia3065eb5,I602e8bb0
* changes:
Update ProgramInfo to match HAL 2.0 changes.
Implement front-end APIs for announcements.
Calin Juravle [Wed, 24 Jan 2018 18:45:00 +0000 (18:45 +0000)]
Merge "[framework] Prepare profile for app code paths"
TreeHugger Robot [Wed, 24 Jan 2018 18:42:33 +0000 (18:42 +0000)]
Merge "Make the quick scrub track smaller to reach the right easier"
David Brazdil [Wed, 24 Jan 2018 18:41:39 +0000 (18:41 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
TreeHugger Robot [Wed, 24 Jan 2018 18:38:44 +0000 (18:38 +0000)]
Merge "Use proper logic operators in package name validation"
Felipe Leme [Wed, 24 Jan 2018 18:31:55 +0000 (18:31 +0000)]
Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev am:
5e687224bd
am:
2418109cf1
Change-Id: I3d8b0e3b785d8427dc6bca9168e7a4b7553cb22f
Kweku Adams [Wed, 24 Jan 2018 00:47:12 +0000 (16:47 -0800)]
Adding comment to alarmmanagerservice.proto.
Bug:
70621331
Test: N/A
Change-Id: I471a7d2084cf60be8a22753139dfbcfeb001617f
Felipe Leme [Wed, 24 Jan 2018 18:23:48 +0000 (18:23 +0000)]
Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev
am:
5e687224bd
Change-Id: I23817abcefde8700c101b756ee6a39d153ea7af5
Daniel Nishi [Wed, 24 Jan 2018 18:22:15 +0000 (18:22 +0000)]
Merge "Add a new setting for Bluetooth on while driving."
TreeHugger Robot [Wed, 24 Jan 2018 18:21:54 +0000 (18:21 +0000)]
Merge "Update crash dialog options."
TreeHugger Robot [Wed, 24 Jan 2018 18:18:24 +0000 (18:18 +0000)]
Merge "Avoid processing log event when there is no uid field."
TreeHugger Robot [Wed, 24 Jan 2018 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev
Benedict Wong [Wed, 24 Jan 2018 18:10:55 +0000 (18:10 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService"
TreeHugger Robot [Wed, 24 Jan 2018 18:10:21 +0000 (18:10 +0000)]
Merge "Fix type in comment"
Mike Digman [Wed, 24 Jan 2018 18:07:33 +0000 (18:07 +0000)]
Merge "Make rotation locked orientation flow ignore forced landscape"
Treehugger Robot [Wed, 24 Jan 2018 18:03:21 +0000 (18:03 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"
Dianne Hackborn [Sat, 20 Jan 2018 01:44:46 +0000 (17:44 -0800)]
Fix issue #
72116995: Add permission guarding Service#startForeground
Now requires permission if targeting P.
Note that this is a separate permission from the existing one
that is required for instant apps to use foreground services. The
reason for this is that their semantics are different (the instant
apps permission is associated with an app op for control over what
the app is allowed, while the regular app permission is just a
normal permission that is always granted and only there for
auditing of apps), and there are probably going to be cases where
a developer will want to use a foreground service in the full
version of their app but not as an instant app.
Bug:
72116995
Test: atest CtsAppTestCases
Change-Id: If5a79e7ed5ab9e0edc77410315eb4d2df8ac850b
TreeHugger Robot [Wed, 24 Jan 2018 17:52:17 +0000 (17:52 +0000)]
Merge "Implement verity header and extension generation"
TreeHugger Robot [Wed, 24 Jan 2018 17:48:52 +0000 (17:48 +0000)]
Merge "Add requireViewById"
Jaewan Kim [Wed, 24 Jan 2018 17:41:49 +0000 (17:41 +0000)]
Merge changes from topics "public_browser2", "public_mediasession2"
* changes:
MediaSession2: Public APIs for MediaBrowser2 and MediaLibraryService2
MediaSession2: Public APIs for MediaSession2 and MediaController2
Geoffrey Pitsch [Wed, 24 Jan 2018 17:33:59 +0000 (17:33 +0000)]
Merge "Security model for moving sharesheet to systemui"
TreeHugger Robot [Wed, 24 Jan 2018 17:28:30 +0000 (17:28 +0000)]
Merge "Add an API to fetch the WebView thread."
yuemingw [Sun, 21 Jan 2018 19:21:27 +0000 (19:21 +0000)]
Turn off ambient settings when DISALLOW_AMBIENT_DISPLAY is set.
Bug:
67675787
Test: manual
Change-Id: I2098b1d71ed7dd86e84137219ba4e8fd7020fad1
Jaewan Kim [Wed, 24 Jan 2018 14:58:35 +0000 (23:58 +0900)]
MediaSession2: Public APIs for MediaBrowser2 and MediaLibraryService2
Test: Run MediaComponents test once
Change-Id: Icea9f7db7f13ed8354c7ce36b069f45ad7ddbfa8
TreeHugger Robot [Wed, 24 Jan 2018 17:19:29 +0000 (17:19 +0000)]
Merge "Basic workspace wireless charging animation"
Jason Parks [Wed, 24 Jan 2018 17:07:17 +0000 (17:07 +0000)]
Merge "Allow unaffiliated Profile Owners to use lock task"
Eric Schwarzenbach [Wed, 24 Jan 2018 17:02:09 +0000 (17:02 +0000)]
Merge "Add PhysicalChannelConfig." am:
c584d2772d am:
3deaafd8cd
am:
9d3738232c
Change-Id: I707415785137603f787ff5e12035d58980a21d18
Jaewan Kim [Wed, 24 Jan 2018 10:04:39 +0000 (19:04 +0900)]
MediaSession2: Public APIs for MediaSession2 and MediaController2
Test: Run MediaComponentsTests once
Change-Id: I0373f927063ab8feb340c6d91b2adc99bbcf92a4
Eric Schwarzenbach [Wed, 24 Jan 2018 16:52:03 +0000 (16:52 +0000)]
Merge "Add PhysicalChannelConfig." am:
c584d2772d
am:
3deaafd8cd
Change-Id: Id6ec6d693ec05d363b2847d0e4eee72fea24aef9
TreeHugger Robot [Wed, 24 Jan 2018 16:49:15 +0000 (16:49 +0000)]
Merge "Simplify the memory metrics atoms."
TreeHugger Robot [Wed, 24 Jan 2018 16:44:40 +0000 (16:44 +0000)]
Merge "Do not output empty metric reports."
Eric Schwarzenbach [Wed, 24 Jan 2018 16:40:14 +0000 (16:40 +0000)]
Merge "Add PhysicalChannelConfig."
am:
c584d2772d
Change-Id: I3377d0502e74e58aed9f2cba746993130a4469dd
Peter Visontay [Wed, 18 Oct 2017 17:40:23 +0000 (18:40 +0100)]
Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes).
Test: Manually tested that the op is noted. Ran opt/net/wifi/tests/wifitests/runtests.sh and base/wifi/tests/runtests.sh. Manually tested that 'idle' mode is now handled correctly.
Bug:
63907873
Change-Id: I66b20cdaab0f93700cc3fb871ae888ae0a9be32b
Jack He [Wed, 17 Jan 2018 23:45:12 +0000 (15:45 -0800)]
BT-HFP: Update Bluetooth headset state handler to Multi-HFP
* When multiple headset devices are connected at the same time, at most one
device can be used for SCO audio at any time. This device is called
Active Device and is indicated by either
BluetoothHeadset.getActiveDevice() or
BluetoothHeadset.ACTIVE_DEVICE_CHANGED intent. It can also be set
through BluetoothHeadset.setActiveDevice(BluetoothDevice) internal API.
* This change let AudioService to listen to ACTIVE_DEVICE_CHANGED intent
instead of CONNECTION_STATE_CHANGED intent since it is the active
device that AudioService cares about, not the list of connected
devices.
* Everytime a new active device is set, AudioService will treat the old
one (if not null) as disconnected and call disconnection methods in
audio framework and the new active device is regarded as newly
connected and connection methods will be called by AudioService.
* When disconnectHeadset() is called, active device will be set to null
Bug:
71875419
Test: compile, connect multiple HFP devices and switch active device
among them
Change-Id: I148cca079d36a2dfc6a46b8d42ba69821c9c6de3
TreeHugger Robot [Wed, 24 Jan 2018 16:23:45 +0000 (16:23 +0000)]
Merge "MediaSession2: Define setAudioAttributes / setAudioFocusRequest"
Eric Schwarzenbach [Wed, 24 Jan 2018 16:17:53 +0000 (16:17 +0000)]
Merge "Add PhysicalChannelConfig."
Jin Seok Park [Wed, 24 Jan 2018 12:48:28 +0000 (21:48 +0900)]
Change MediaControlView2 APIs
Test: build
Change-Id: Ida307fa16f76e680aa12b92cbce4a8635cac17b2
TreeHugger Robot [Wed, 24 Jan 2018 15:57:44 +0000 (15:57 +0000)]
Merge "Revert "Use ImageDecoder for BitmapDrawable""
TreeHugger Robot [Wed, 24 Jan 2018 15:45:08 +0000 (15:45 +0000)]
Merge "Initial implmentation of AnimatedImageDrawables on the RenderThread."
Michal Karpinski [Wed, 24 Jan 2018 15:40:09 +0000 (15:40 +0000)]
Use proper logic operators in package name validation
And add unit tests for common validators as atonement...
Test: atest frameworks/base/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java
Bug:
64988620
Change-Id: I561319356cbca70da326586c2a762293c4ade9ed
Tony Mak [Wed, 24 Jan 2018 15:31:34 +0000 (15:31 +0000)]
Merge "Swap the order of realCallingUid and realCallingPid in startActivityInPackage"
Jorim Jaggi [Wed, 24 Jan 2018 15:29:59 +0000 (15:29 +0000)]
Merge "Fixed the case where the task was moved to the front"
Julia Reynolds [Tue, 23 Jan 2018 18:55:18 +0000 (13:55 -0500)]
Output chooser layout updates
- Anchor output chooser to volume buttons
- Dismiss output chooser if volume dialog becomes visible
Test: manual, runtest systemui
Fixes:
72319160
Bug:
63096355
Change-Id: Ibca7576f287655fb5c98554e67781ec53152ddef
Julia Reynolds [Tue, 23 Jan 2018 17:37:56 +0000 (12:37 -0500)]
Volume layout updates
- Add shadow
- make the sliders to LTR in landscape
- make all sliders horizontal in landscape
- stack volume rows in landscape
Test: manual
Bug:
63096355
Change-Id: I5452aa3b962727982d5fc103313518e9cbf2750e
Fixes:
72303358
Fixes:
72260231
Fixes:
72260096
TreeHugger Robot [Wed, 24 Jan 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Display smart replies in notifications"
Tony Mak [Wed, 24 Jan 2018 15:11:06 +0000 (15:11 +0000)]
Swap the order of realCallingUid and realCallingPid in startActivityInPackage
Checked ag/
3483468, we are always passing pid first, let's swap the
order then.
Test: Setup work profile -> add work account
Fix:
72429434
Change-Id: I8fd05b42fa22a3e46a87b3f6a0902e0e5a797dc9
Beverly [Wed, 24 Jan 2018 15:07:06 +0000 (10:07 -0500)]
DND qs tile primary text is always Do not disturb
In P, do not disturb in quick settings always uses priority-only
do not disturb, so there is no reason to distinguish between
priority-only/alarms only/total silence modes. Users can still change
the behavior of priority-dnd in settings, but this will not chang the
primary text of the quick settings tile for dnd.
Change-Id: I5b6e911cb2542a7a1d0696871607eb8abc95cd43
Fixes:
72418705
Test: manual (toggle on/off dnd qs tile)
TreeHugger Robot [Wed, 24 Jan 2018 15:03:22 +0000 (15:03 +0000)]
Merge "Add broadcast when notification block state changes"
TreeHugger Robot [Wed, 24 Jan 2018 15:01:25 +0000 (15:01 +0000)]
Merge "Use stubs libs for android.test.base/runner/mock"
Gustav Sennton [Fri, 19 Jan 2018 12:11:25 +0000 (12:11 +0000)]
Add an API to fetch the WebView thread.
Some WebView APIs contain checks ensuring apps only use WebView APIs
from one single thread. The WebView Support Library should perform
similar thread checks. To do so we publish an API to get the WebView
thread, so that the support library knows which thread to check against.
Test: Ran the corresponding CTS tests.
Bug:
38220806
Change-Id: Ibab878e211d9594df6d39f99ce130e28fac7f019
TreeHugger Robot [Wed, 24 Jan 2018 14:39:23 +0000 (14:39 +0000)]
Merge "Enable MediaUpdateService on userdebug and eng builds."
Beverly [Mon, 11 Dec 2017 14:20:02 +0000 (09:20 -0500)]
Basic workspace wireless charging animation
(No animation on ambient or lockscreen yet)
Test: manual (testing w/o wireless charger, set DEBUG_WIRELESS=true)
Bug:
67598445
Change-Id: Ifeef72805930187b8f78e72fd44bd7da25724e0c
Vladislav Kuzkokov [Mon, 22 Jan 2018 22:37:14 +0000 (23:37 +0100)]
Fix Printing policy in profile owner.
Sometimes app inside profile can't get package info for its owner.
Instead of relying on calling user id, we make PrintManagerService switch to
system id and pass user that called print() explicitly.
Bug:
72309652
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPrintingPolicy
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPrintingPolicy
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedProfileOwnerTest#testPrintingPolicy
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: Ib97018f56693549fbca506dba6efaadb6dd010b3
TreeHugger Robot [Wed, 24 Jan 2018 14:12:28 +0000 (14:12 +0000)]
Merge "Set "results source" on RemoteInput intents sent from System UI"
David Brazdil [Thu, 18 Jan 2018 15:25:18 +0000 (15:25 +0000)]
Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps
For now, system apps will be exempt from hidden API access checks.
Pass the appropriate flag to dexopt.
Test: manual
Bug:
64382372
Bug:
72305689
Change-Id: I5676ffa3a5ba680bf5f6bab0b62f0acf4a933097
Oscar Key [Wed, 24 Jan 2018 13:51:26 +0000 (13:51 +0000)]
Merge "Let the transport ask for non-incremental backup."
Leon Scroggins III [Tue, 23 Jan 2018 22:17:36 +0000 (17:17 -0500)]
Revert "Use ImageDecoder for BitmapDrawable"
Bug:
72381918
Test: Covered by existing tests
This CL seems to have broken the theme tests. In addition, it changes
the behavior of a couple of cases of passing InputStreams to the
framework. Previously, the framework used BitmapFactory, which did not
close the InputStreams, but ImageDecoder does.
Planning to reland along with the fix for closing in ag/
3497523 and the
fix for the theme tests.
This reverts commit
66c6d78908e0203a497c2e97398c824b2591ea19.
Change-Id: I4ac6d0f2e1e2bb0925ae71c141bfe8a0d37e6a16
Jeffrey Vander Stoep [Wed, 24 Jan 2018 13:32:34 +0000 (13:32 +0000)]
Merge "Reland: pm: Scan-as-privileged apps that share a privileged user"
Derek Sollenberger [Mon, 22 Jan 2018 15:25:26 +0000 (10:25 -0500)]
Initial implmentation of AnimatedImageDrawables on the RenderThread.
The current implementation schedules the next frame of the images
to be decoded after the current frame completes but potentially
schedules tasks that will result in a no-op execution if a new
frame is not yet needed.
Test: HwAccelerationTest
Change-Id: I0510cb5a1b801abd651327e924deb586af0306d6
Nicolas Geoffray [Wed, 24 Jan 2018 13:02:16 +0000 (13:02 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am:
1f568c14ac am:
b91d1b3e3a
am:
b5928a2b81 -s ours
Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30
Insun Kang [Wed, 24 Jan 2018 13:00:01 +0000 (22:00 +0900)]
MediaSession2: Define setAudioAttributes / setAudioFocusRequest
Test: build
Change-Id: I8ed824e1f1bd536ac37647d94f88195ec7b51bdc
Benoit Lamarche [Wed, 24 Jan 2018 12:45:48 +0000 (12:45 +0000)]
Merge "Fail when there is an ASM error" am:
4152497b4b am:
05bb83c87d
am:
5fb872e787
Change-Id: I63222e0f376184649f8634932edc6ee296418b91
Nicolas Geoffray [Wed, 24 Jan 2018 12:40:45 +0000 (12:40 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am:
1f568c14ac
am:
b91d1b3e3a
Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
Benoit Lamarche [Wed, 24 Jan 2018 12:36:26 +0000 (12:36 +0000)]
Merge "Fail when there is an ASM error" am:
4152497b4b
am:
05bb83c87d
Change-Id: I27be59afd9f021c2933d10b6becb0f7542162a37
Nicolas Geoffray [Wed, 24 Jan 2018 12:25:10 +0000 (12:25 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
am:
1f568c14ac
Change-Id: I49a375508824696b3f362bce720a296d85a084aa
Benoit Lamarche [Wed, 24 Jan 2018 12:21:23 +0000 (12:21 +0000)]
Merge "Fail when there is an ASM error"
am:
4152497b4b
Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
Ricky Wai [Wed, 24 Jan 2018 12:03:07 +0000 (12:03 +0000)]
Merge "Fix cannot generate network watchlist report when database is empty"
Adrian Roos [Wed, 24 Jan 2018 11:56:32 +0000 (11:56 +0000)]
Merge "FRP: Explicitly throw UnsupportedOperation when FRP is not supported"
Petr Cermak [Fri, 19 Jan 2018 15:00:24 +0000 (15:00 +0000)]
Set "results source" on RemoteInput intents sent from System UI
If the input comes from RemoteInputView (the user manually typed an
inline reply), the source is set to RemoteInput.SOURCE_FREE_FORM_INPUT.
If the input comes from SmartReplyView (the user tapped on a smart reply
button), the source is set to RemoteInput.SOURCE_CHOICE.
Bug:
67765414
Test: atest RemoteInputViewTest SmartReplyViewTest
Change-Id: Icff46b903a968bd8457624b358d626b457569352
Petr Cermak [Thu, 18 Jan 2018 15:52:10 +0000 (15:52 +0000)]
Display smart replies in notifications
If a notification contains a RemoteInput with non-empty choices,
NotificationContentView will add a SmartReplyView to
smart_reply_container in the expanded notification layout (if present).
This feature is guarded behind
Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS.
Screenshot: https://screenshot.googleplex.com/jEzeL2ZYLMj.png
Bug:
67765414
Test: Viewed a notification with smart replies from Android Messages
Change-Id: I24d16df086edb58f51ae63830212d68166c74f52
Neil Fuller [Wed, 24 Jan 2018 11:47:10 +0000 (11:47 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Jin Seok Park [Wed, 24 Jan 2018 11:24:17 +0000 (11:24 +0000)]
Merge "Put latest MediaControlView2/VideoView2 code"
Jaewan Kim [Wed, 24 Jan 2018 11:05:21 +0000 (11:05 +0000)]
Merge "MediaSession2: Stop overriding MediaPlayerBase for session/controller"