OSDN Git Service
Doris Ling [Thu, 1 Mar 2018 00:06:19 +0000 (16:06 -0800)]
Add default implementation to handle master dev option switch.
- subclass that does not override the methods will inherit the default
behavior: preference will be enabled/disabled when the top level
developer options switch is turned on/off.
Bug:
73955632
Test: make RunSettingsLibRoboTests
Change-Id: I477170afd7eb4d74a807c933dcc254ff7a4bbd96
TreeHugger Robot [Wed, 28 Feb 2018 17:15:30 +0000 (17:15 +0000)]
Merge "Make "am kill" actually support --user all"
Anton Hansson [Wed, 28 Feb 2018 17:09:04 +0000 (17:09 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
TreeHugger Robot [Wed, 28 Feb 2018 17:08:47 +0000 (17:08 +0000)]
Merge "Revert "Update A11y action serialization to use longs""
TreeHugger Robot [Wed, 28 Feb 2018 17:03:20 +0000 (17:03 +0000)]
Merge "Use the proper API to get managed profile user drawable"
yuemingw [Mon, 26 Feb 2018 14:25:35 +0000 (14:25 +0000)]
Better Override APN javadoc.
Add explanation for the possible failure reasons of
addOverrideApn, updateOverrideApn and removeOverrideApn.
Bug:
73750993
Test: test not required
Change-Id: Ic3493043fe6e5fedea006118bfc8dab7219d03ab
TreeHugger Robot [Wed, 28 Feb 2018 16:36:23 +0000 (16:36 +0000)]
Merge "MediaPlayerBase API"
TreeHugger Robot [Wed, 28 Feb 2018 16:25:31 +0000 (16:25 +0000)]
Merge "Revert "Elevate remote/recents animation priority""
TreeHugger Robot [Wed, 28 Feb 2018 16:04:20 +0000 (16:04 +0000)]
Merge "Remove repackaged.android.test.mock"
TreeHugger Robot [Wed, 28 Feb 2018 15:45:25 +0000 (15:45 +0000)]
Merge "Ignores resolution if installer is disabled"
Bo Zhu [Wed, 28 Feb 2018 15:14:49 +0000 (15:14 +0000)]
Merge "Check the given CertPath against the root of trust during recovery"
Anton Hansson [Fri, 23 Feb 2018 12:57:51 +0000 (12:57 +0000)]
frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Change-Id: I4233b9091d9066c4fa69f3d24aaf367ea500f760
Tony Mak [Wed, 28 Feb 2018 14:59:31 +0000 (14:59 +0000)]
Use the proper API to get managed profile user drawable
FIX:
73997367
Test: Go to settings -> Storage, observes the icon change.
Change-Id: I60153b31adf1175aea4cdf960d5094a89e8bc6b9
Artem Iglikov [Wed, 28 Feb 2018 15:07:31 +0000 (15:07 +0000)]
Revert "Update A11y action serialization to use longs"
This reverts commit
54549163b09e78396d6998172437b52a5cb7a042.
Reason for revert: breaks tests, b/
73997494
Bug:
73997494
Change-Id: I122c260898277d876c019554cb92351ac13a9eb0
TreeHugger Robot [Wed, 28 Feb 2018 14:26:34 +0000 (14:26 +0000)]
Merge "Bmgr about running backups"
TreeHugger Robot [Wed, 28 Feb 2018 14:24:52 +0000 (14:24 +0000)]
Merge "Add short term model reset threshold"
Android Build Merger (Role) [Wed, 28 Feb 2018 14:14:22 +0000 (14:14 +0000)]
Merge "Merge "Don't use cutils/Atomic.h" am:
07735797a2 am:
a272d540d8 am:
0f4ca4a5c0"
TreeHugger Robot [Wed, 28 Feb 2018 14:14:16 +0000 (14:14 +0000)]
Merge "Implement QS spec."
Steven Moreland [Wed, 28 Feb 2018 14:13:52 +0000 (14:13 +0000)]
Merge "Don't use cutils/Atomic.h" am:
07735797a2 am:
a272d540d8
am:
0f4ca4a5c0
Change-Id: I4b9798b39d890537f888415b5ac283227970e4de
Jorim Jaggi [Wed, 28 Feb 2018 14:03:08 +0000 (14:03 +0000)]
Revert "Elevate remote/recents animation priority"
This reverts commit
574aea0f1b073889186a82c94a991cc746b1c58c.
Reason for revert: Crashes sometimes (chaselist issue)
Change-Id: I1440ef7a002e85c3e020d424f13073ca2516dd9c
Fixes:
73991490
Steven Moreland [Wed, 28 Feb 2018 14:01:17 +0000 (14:01 +0000)]
Merge "Don't use cutils/Atomic.h" am:
07735797a2
am:
a272d540d8
Change-Id: Ie442c255e43f2ebe80ef5423aa4508930d72c44c
TreeHugger Robot [Wed, 28 Feb 2018 13:54:25 +0000 (13:54 +0000)]
Merge "Use putIntForUser to turn off ambient display secure settings"
Steven Moreland [Wed, 28 Feb 2018 13:51:44 +0000 (13:51 +0000)]
Merge "Don't use cutils/Atomic.h"
am:
07735797a2
Change-Id: Ie56fadea498f35c7e820f9fadac1b64697565a78
Bernardo Rufino [Wed, 28 Feb 2018 13:49:26 +0000 (13:49 +0000)]
Merge "More tests for ActiveRestoreSession - 2"
TreeHugger Robot [Wed, 28 Feb 2018 13:43:36 +0000 (13:43 +0000)]
Merge "Remove @removed from APIs still in use"
Treehugger Robot [Wed, 28 Feb 2018 12:37:50 +0000 (12:37 +0000)]
Merge "Don't use cutils/Atomic.h"
Bernardo Rufino [Wed, 28 Feb 2018 12:10:18 +0000 (12:10 +0000)]
Bmgr about running backups
Says that backups can be canceled if one already running. Put message
for running backups in dumpsys for checking.
Bug:
72484277
Test: Triggered backup, checked dumpsys and bmgr backupnow
Change-Id: I028cf663858e374389f50175aaf5a3e8c9d45e42
Dan Gittik [Thu, 22 Feb 2018 13:53:47 +0000 (13:53 +0000)]
Add short term model reset threshold
Add a threshold to prevent user birghtness adjustments from reseting
without a drastic enough change in the ambient light, and some minor
refactoring
Test: manually adjust brightness; turn screen off for 30 seconds;
turn screen back on; brightness shouldn't change
Test: manually adjust brightness; turn screen off for 30 seconds;
cover light sensor; turn screen back on; brightness should change
Make short term model reset decision only happen once, and change its
threshold to be relative
Test: same as before
Minor refactoring
Test: same as before
Fixes:
72734580
Change-Id: I724e88ddb79a55cadb547463d73131028bb57825
Alexandru-Andrei Rotaru [Wed, 28 Feb 2018 11:40:00 +0000 (11:40 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
e8b557bc08 -s ours am:
5217a34008 -s ours
am:
49b368b447 -s ours
Change-Id: If888f1000209f015dc097b616c64d626848d4402
Alexandru-Andrei Rotaru [Wed, 28 Feb 2018 11:25:14 +0000 (11:25 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
e8b557bc08 -s ours
am:
5217a34008 -s ours
Change-Id: I6672cd7a23ee7c6b5d384fae7111be2948f59e45
Alexandru-Andrei Rotaru [Wed, 28 Feb 2018 11:11:39 +0000 (11:11 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am:
e8b557bc08 -s ours
Change-Id: I2a1805375252b56209ac9d18da0f1771f5b6187b
Bernardo Rufino [Wed, 28 Feb 2018 11:05:18 +0000 (11:05 +0000)]
More tests for ActiveRestoreSession - 2
Around restorePackage().
Test: m - j RunFrameworksServicesRoboTests
Change-Id: I291d899d5bb786a1d394e758698418718d6c4d9b
Alex Chau [Wed, 28 Feb 2018 10:47:48 +0000 (10:47 +0000)]
Use putIntForUser to turn off ambient display secure settings
- Without forUser we'll be turning off ambient display in primary user instead
Test: Use TestDPC to set DISALLOW_AMBIENT_DISPLAY in secondary users, ambient display is actually turned off
Bug:
72487689
Change-Id: I11a7a5304fcc609ab37594ad5d28814c217bc7f5
TreeHugger Robot [Wed, 28 Feb 2018 10:43:38 +0000 (10:43 +0000)]
Merge "Unhide VideoView2 APIs"
Robert Berry [Wed, 28 Feb 2018 10:14:24 +0000 (10:14 +0000)]
Remove @removed from APIs still in use
I completely misunderstood this annotation.
Bug:
73962883
Test: ran unit tests
Change-Id: Id3e3863fc6fd1e0614a3c75d25cd35239667eaf0
TreeHugger Robot [Wed, 28 Feb 2018 10:28:25 +0000 (10:28 +0000)]
Merge "Unhide MediaControlView2 APIs"
Michal Karpinski [Wed, 28 Feb 2018 10:08:14 +0000 (10:08 +0000)]
Merge "Allow restoring of apps that rotated key"
Treehugger Robot [Wed, 28 Feb 2018 10:03:02 +0000 (10:03 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Alexandru-Andrei Rotaru [Tue, 18 Jul 2017 15:49:22 +0000 (16:49 +0100)]
Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I4a57137a7ad592ca186d9508d5cc2fad3f1bc985
Insun Kang [Wed, 24 Jan 2018 06:56:37 +0000 (15:56 +0900)]
Unhide VideoView2 APIs
Test: make update-api
Bug:
64293205
Change-Id: Ie57e3ea78dd623fc095c1ad5f270f3b97320f155
Android Build Merger (Role) [Wed, 28 Feb 2018 08:42:50 +0000 (08:42 +0000)]
Merge "Merge "Add OEM_PAID network capability" am:
4c00edd361 am:
7b87c2050c am:
3b7de55419"
Pavel Maltsev [Wed, 28 Feb 2018 08:42:24 +0000 (08:42 +0000)]
Merge "Add OEM_PAID network capability" am:
4c00edd361 am:
7b87c2050c
am:
3b7de55419
Change-Id: Id64d288764dc5a556b60f5e3b866b40792647ac0
TreeHugger Robot [Wed, 28 Feb 2018 08:40:29 +0000 (08:40 +0000)]
Merge "Change PreferenceController#getSummary return type."
Pavel Maltsev [Wed, 28 Feb 2018 08:28:25 +0000 (08:28 +0000)]
Merge "Add OEM_PAID network capability" am:
4c00edd361
am:
7b87c2050c
Change-Id: Ie0377fea66f784c910bd0a06f87543cc5cf82c84
Pavel Maltsev [Wed, 28 Feb 2018 08:14:48 +0000 (08:14 +0000)]
Merge "Add OEM_PAID network capability"
am:
4c00edd361
Change-Id: I2fb8825bc1038783ef45907846b52192b6fe5d18
Bo Zhu [Wed, 28 Feb 2018 07:52:19 +0000 (23:52 -0800)]
Check the given CertPath against the root of trust during recovery
Bug:
73826459
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I28893d815c57260c4d0f0d55d252bff5d34d4832
Maurice Lam [Wed, 28 Feb 2018 07:20:36 +0000 (07:20 +0000)]
Merge "Revert "Small fixes to StatsManager API.""
Treehugger Robot [Wed, 28 Feb 2018 07:06:00 +0000 (07:06 +0000)]
Merge "Add OEM_PAID network capability"
Jean-Michel Trivi [Wed, 28 Feb 2018 04:09:10 +0000 (20:09 -0800)]
MediaPlayerBase API
Define as an abstract class the high level interface for
media players. Consumers are MediaSession2, providers
are MediaPlayer2, which will extend this class.
Bug:
64098437
Test: to be in MediaPlayer2 tests once it extends MPB
Change-Id: Id0d0fcb6d1b377a0e05a4a8e3d659e12a58fc45e
TreeHugger Robot [Wed, 28 Feb 2018 06:19:35 +0000 (06:19 +0000)]
Merge "Dynamics Processing Effect"
fionaxu [Wed, 28 Feb 2018 05:14:07 +0000 (05:14 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs" am:
8c32954906 am:
0713fcf66d
am:
9af710c587 -s ours
Change-Id: I9361259e27ffea1ec358323f57cc4681c7c5e991
Jin Seok Park [Wed, 24 Jan 2018 07:46:44 +0000 (16:46 +0900)]
Unhide MediaControlView2 APIs
Test: make update-api
Bug:
64293205
Change-Id: Ia202a7fc1f8733cc2d95d13e7126916affe4f52e
fionaxu [Wed, 28 Feb 2018 05:03:13 +0000 (05:03 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs" am:
8c32954906
am:
0713fcf66d
Change-Id: Iacf464a898da538795152135b0c40cd648bbdf7d
Brad Ebinger [Wed, 28 Feb 2018 04:59:52 +0000 (04:59 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy" am:
59391aa4a0 am:
8f2c2ca09a
am:
27617a9894
Change-Id: Id4638c9126cce687bb4513731be2aeb962b2250d
TreeHugger Robot [Wed, 28 Feb 2018 04:50:17 +0000 (04:50 +0000)]
Merge "Add the option to match a whitelist of strings in FieldValueMatcher."
Cassie [Wed, 28 Feb 2018 04:47:16 +0000 (04:47 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am:
e6691d8e89 am:
f29d208045
am:
9f373ee378
Change-Id: I9dcb76126e9cb06a7967f3f003b78fe605b69167
Brad Ebinger [Wed, 28 Feb 2018 04:46:13 +0000 (04:46 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy" am:
59391aa4a0
am:
8f2c2ca09a
Change-Id: Id4762516cce2f6f902542d0b15195e9531c2eda4
fionaxu [Wed, 28 Feb 2018 04:45:25 +0000 (04:45 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs"
am:
8c32954906
Change-Id: Ia770310f6135df041bc1d84b09cfbdcda1debd2f
Cassie [Wed, 28 Feb 2018 04:36:03 +0000 (04:36 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am:
e6691d8e89
am:
f29d208045
Change-Id: Ib04ccee612d521818ac45f29895e604646286705
Brad Ebinger [Wed, 28 Feb 2018 04:33:28 +0000 (04:33 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy"
am:
59391aa4a0
Change-Id: Iaf27b98f03c363ca23989c251f9e5d66bae394ba
Cassie [Wed, 28 Feb 2018 04:25:25 +0000 (04:25 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process."
am:
e6691d8e89
Change-Id: I0832ce666883a9054a9252ef93d50e615a64bc79
TreeHugger Robot [Wed, 28 Feb 2018 04:20:44 +0000 (04:20 +0000)]
Merge "Add null check in usagestats dump"
Maurice Lam [Wed, 28 Feb 2018 04:17:03 +0000 (04:17 +0000)]
Revert "Small fixes to StatsManager API."
This reverts commit
16dcd33abdc80b3bd4455ec867a32675f66faa13.
Reason for revert: b/
73975175
Bug:
73975175
Change-Id: I5bcccde100900b1370c2e43b8bcfc7d1697e5c72
TreeHugger Robot [Wed, 28 Feb 2018 04:13:20 +0000 (04:13 +0000)]
Merge "Add incidentd to readproc group."
TreeHugger Robot [Wed, 28 Feb 2018 04:10:29 +0000 (04:10 +0000)]
Merge "Atoms: Keygaurd and Bouncer"
TreeHugger Robot [Wed, 28 Feb 2018 04:01:41 +0000 (04:01 +0000)]
Merge "Added indication update mode support"
TreeHugger Robot [Wed, 28 Feb 2018 03:48:35 +0000 (03:48 +0000)]
Merge "Import launcher style reveal animations to QS."
Tony Wickham [Wed, 28 Feb 2018 03:35:03 +0000 (03:35 +0000)]
Merge "Allow packages to be blacklisted from showing recents onboarding"
Winson Chung [Wed, 28 Feb 2018 03:30:31 +0000 (03:30 +0000)]
Merge "1/ Fixing docked task animation when entering split screen from home"
TreeHugger Robot [Wed, 28 Feb 2018 03:15:46 +0000 (03:15 +0000)]
Merge "Add a comment to allocate field number above 100000 for OEMs to use and block them off from being used."
Treehugger Robot [Wed, 28 Feb 2018 03:14:45 +0000 (03:14 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs"
rago [Mon, 5 Feb 2018 17:38:25 +0000 (09:38 -0800)]
Dynamics Processing Effect
Adding Dynamics Processing Effect api and configuration helpers.
Bug:
64161702
Bug:
38266419
Test: manual testing and CTS test ag/
3662965
Change-Id: I993e1621011a16596aa00ea049fa8681463e8551
Treehugger Robot [Wed, 28 Feb 2018 03:02:27 +0000 (03:02 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy"
TreeHugger Robot [Wed, 28 Feb 2018 03:02:16 +0000 (03:02 +0000)]
Merge "Implement a new section to attach LAST_KMSG to incident report This section simply gzip a large file and stores result in GZippedFileProto"
TreeHugger Robot [Wed, 28 Feb 2018 02:52:31 +0000 (02:52 +0000)]
Merge "Set systemReady before querying the portStatus."
Treehugger Robot [Wed, 28 Feb 2018 02:30:44 +0000 (02:30 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process."
Jordan Liu [Wed, 28 Feb 2018 02:05:51 +0000 (02:05 +0000)]
Merge "Use 4 thresholds instead of 6" am:
fdebcf1ae2 am:
00fef4fb3d
am:
d16720459d -s ours
Change-Id: Ie29384e3f86c2deb462fd9503d0950d729d3a5b4
fionaxu [Tue, 27 Feb 2018 05:11:40 +0000 (21:11 -0800)]
Don't throw exception if phone process is dead for carrier ID APIs
Bug:
73772776
Test: Build
Change-Id: I81638f52d5d8ccf1005878ba4f3967e07169284b
(cherry picked from commit
331965e5d6f753cd061303607cdfbe9dff4be896)
Merged-in: I81638f52d5d8ccf1005878ba4f3967e07169284b
Jordan Liu [Wed, 28 Feb 2018 01:51:40 +0000 (01:51 +0000)]
Merge "Use 4 thresholds instead of 6" am:
fdebcf1ae2
am:
00fef4fb3d
Change-Id: If6f8e1f938298506068d87e008ab0de21b8ff6a3
Chen Xu [Wed, 28 Feb 2018 01:49:15 +0000 (01:49 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs"
Michael Wachenschwanz [Tue, 27 Feb 2018 23:54:27 +0000 (15:54 -0800)]
Add null check in usagestats dump
(also adjust the time stamp for easier parsing)
Change-Id: I708c9fe68aa85b4897e95cca6b9d53522eef0d29
Fixes:
73960916
Test: manual
Jack Yu [Tue, 27 Feb 2018 23:15:14 +0000 (15:15 -0800)]
Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.
Test: Manual
Bug:
65112388
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
Jordan Liu [Wed, 28 Feb 2018 01:39:58 +0000 (01:39 +0000)]
Merge "Use 4 thresholds instead of 6"
am:
fdebcf1ae2
Change-Id: Ie2d1ab2e79d0d3cc79815da7af4022e58838e5cd
TreeHugger Robot [Wed, 28 Feb 2018 01:29:27 +0000 (01:29 +0000)]
Merge "Duration tracker optimization."
TreeHugger Robot [Wed, 28 Feb 2018 01:21:41 +0000 (01:21 +0000)]
Merge "New attribute textFontWeight for selecting weight in the font family"
Tony Wickham [Tue, 27 Feb 2018 23:40:33 +0000 (15:40 -0800)]
Allow packages to be blacklisted from showing recents onboarding
Test: start a blacklisted intent and verify onboarding doesn't show
there, but does on subsequent apps.
Bug:
73723502
Bug:
70180942
Change-Id: I2d03413bfde46e8e6bcd460d88c3a693e089fec2
TreeHugger Robot [Wed, 28 Feb 2018 01:00:23 +0000 (01:00 +0000)]
Merge "AAPT2: Fix styled string whitespace processing"
yro [Mon, 26 Feb 2018 22:22:54 +0000 (14:22 -0800)]
Add a comment to allocate field number above 100000 for OEMs to use and block
them off from being used.
Bug:
72866543
Test: statsd_test, cts tests
Change-Id: I2074f53eb3360aa93a9bea4e596a8c295696312f
Winson Chung [Wed, 21 Feb 2018 18:15:17 +0000 (10:15 -0800)]
1/ Fixing docked task animation when entering split screen from home
- Update the minimized state when docking an app from home to ensure that
the animation of the docked task goes to the right bounds
- Temporarily block the invocation of the old recents activity when showing
recents as a part of setting the windowing mode of another task (this is
fine right now because quickstep only allows docking via the UI and not
from the nav bar while another task is open).
- Add proto field so we can determine whether to check the recents activity
from the split screen CTS tests
- Also fix issue with invisible docked task due to wrong bounds calculated
due to launcher not notifying the divider of the first docked frame
Bug:
73118672
Test: go/wm-smoke
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerSplitScreenTests
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerTransitionSelectionTests
Change-Id: Ib1208501c311de009a9e706103134865c521cb63
TreeHugger Robot [Wed, 28 Feb 2018 00:42:28 +0000 (00:42 +0000)]
Merge "Remove connected devices feature flag"
TreeHugger Robot [Wed, 28 Feb 2018 00:41:32 +0000 (00:41 +0000)]
Merge "Add AOD to BatterySaverPolicy"
TreeHugger Robot [Wed, 28 Feb 2018 00:39:33 +0000 (00:39 +0000)]
Merge "createAndManageUser should communicate reason of failure to caller"
Tony Mak [Wed, 28 Feb 2018 00:31:44 +0000 (00:31 +0000)]
Merge "Blue work profile badge - Blue is the new orange"
Tetsutoki Shiozawa [Wed, 28 Feb 2018 00:24:18 +0000 (00:24 +0000)]
Merge "Fix: Double-free error on RemoteFillService" am:
5b04f89343 am:
b23ec4eaa7
am:
fddb86a80c
Change-Id: I87de2e6bc8f446dc0cddf41cb3e40d76cdc55d98
TreeHugger Robot [Wed, 28 Feb 2018 00:19:29 +0000 (00:19 +0000)]
Merge "Show next alarm on ambient display"
Alex Chau [Wed, 28 Feb 2018 00:16:41 +0000 (00:16 +0000)]
Merge "API Review: android.os.UserManager.DISALLOW_USER_SWITCH"
Lucas Dupin [Wed, 28 Feb 2018 00:15:35 +0000 (00:15 +0000)]
Merge "Show battery percentage on indication field"
Patrick Baumann [Wed, 28 Feb 2018 00:14:38 +0000 (16:14 -0800)]
Ignores resolution if installer is disabled
This change adds a check to ensure that the instant app installer is
enabled for the resolving user before adding it to resolve infos. This
ensures that the installer isn't launched for a user that has explicitly
disabled it, such as within a work profile or secondary user.
Bug:
73035688
Test: atest EphemeralTest
Test: manual launch AIA link with installer disabled -> no crash
Change-Id: I563747410ff8b51c82f0dbcbe009f15d9625714c
Tetsutoki Shiozawa [Wed, 28 Feb 2018 00:12:33 +0000 (00:12 +0000)]
Merge "Fix: Double-free error on RemoteFillService" am:
5b04f89343
am:
b23ec4eaa7
Change-Id: I3acedf1add384730df6f987b0f20edb77b250228
TreeHugger Robot [Wed, 28 Feb 2018 00:09:15 +0000 (00:09 +0000)]
Merge changes from topic "terminal_type_fix"
* changes:
Add test for UsbDescriptorParser.java
USB Audio: broaden Terminal Type interpretation