OSDN Git Service
TreeHugger Robot [Wed, 28 Feb 2018 22:28:30 +0000 (22:28 +0000)]
Merge "Added an api to query ForcedAppStandby state"
TreeHugger Robot [Wed, 28 Feb 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Tag foreground notis that use certain services"
TreeHugger Robot [Wed, 28 Feb 2018 21:59:47 +0000 (21:59 +0000)]
Merge "Toggle READ_BINARY_CPU_TIME"
TreeHugger Robot [Wed, 28 Feb 2018 21:54:03 +0000 (21:54 +0000)]
Merge "Add component ordering"
TreeHugger Robot [Wed, 28 Feb 2018 21:22:30 +0000 (21:22 +0000)]
Merge "slice() the ByteBuffer passed to ImageDecoder"
TreeHugger Robot [Wed, 28 Feb 2018 21:18:55 +0000 (21:18 +0000)]
Merge "[Companion] Stop scanning after 20sec timeout"
Android Build Merger (Role) [Wed, 28 Feb 2018 20:53:04 +0000 (20:53 +0000)]
Merge "Merge "Mark EUICC_PROVISIONED as @SystemApi." am:
4b5680b6fa am:
41fa5ff101 am:
a64db1336d -s ours"
Holly Jiuyu Sun [Wed, 28 Feb 2018 20:52:39 +0000 (20:52 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi." am:
4b5680b6fa am:
41fa5ff101
am:
a64db1336d -s ours
Change-Id: Icdff2b0bf538f1da59acc7757871e2fa3b01e0e0
Leon Scroggins [Wed, 28 Feb 2018 20:51:43 +0000 (20:51 +0000)]
Merge "Fixes for YuvToJpegEncoder::encode"
TreeHugger Robot [Wed, 28 Feb 2018 20:47:32 +0000 (20:47 +0000)]
Merge "Reset bouncer instead of just hiding it"
Holly Jiuyu Sun [Wed, 28 Feb 2018 20:38:13 +0000 (20:38 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi." am:
4b5680b6fa
am:
41fa5ff101
Change-Id: Ie737a298f1ab342d571e150be452a9590e623052
Andrii Kulian [Wed, 28 Feb 2018 20:29:23 +0000 (20:29 +0000)]
Merge "Use post-execution state for lifecycle callback sequences"
Jeff Sharkey [Wed, 28 Feb 2018 20:29:01 +0000 (20:29 +0000)]
Merge "More robust @RequiresPermission handling."
Holly Jiuyu Sun [Wed, 28 Feb 2018 20:24:08 +0000 (20:24 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi."
am:
4b5680b6fa
Change-Id: I7e3542edd0d092d6b0a7bc10b80b0565dfefda7e
TreeHugger Robot [Wed, 28 Feb 2018 20:22:59 +0000 (20:22 +0000)]
Merge "[AWARE] Add target API check to the Responder to ANYONE config"
Jason Monk [Wed, 28 Feb 2018 20:01:09 +0000 (20:01 +0000)]
Merge "Add APIs to look into whats in an Icon"
TreeHugger Robot [Wed, 28 Feb 2018 19:55:15 +0000 (19:55 +0000)]
Merge "deprecate EmbossMaskFilter"
Mike Ma [Wed, 28 Feb 2018 19:51:56 +0000 (11:51 -0800)]
Toggle READ_BINARY_CPU_TIME
Test: N/A
Change-Id: I41403c16feffa61dd4e3ae13498ff63b26a1d4b2
TreeHugger Robot [Wed, 28 Feb 2018 19:37:05 +0000 (19:37 +0000)]
Merge "Avoid reading logs that were processed before."
TreeHugger Robot [Wed, 28 Feb 2018 19:33:25 +0000 (19:33 +0000)]
Merge "Include slider events from managed profile."
TreeHugger Robot [Wed, 28 Feb 2018 19:05:29 +0000 (19:05 +0000)]
Merge "Allow chaining ImageDecoder's setters"
Julia Reynolds [Wed, 21 Feb 2018 17:25:27 +0000 (12:25 -0500)]
Tag foreground notis that use certain services
- Draw over other apps
- Camera
- Microphone
The icons are not yet clickable, and the system 'drawing over
other apps' notification still appears even when the app's
notification is tagged.
Test: runtest systemui
Bug:
64085448
Change-Id: Ib3b0cdd9adced82f562f256cb81af80dc395440d
TreeHugger Robot [Wed, 28 Feb 2018 18:47:03 +0000 (18:47 +0000)]
Merge "setPreferRamOverQuality -> setConserveMemory"
Android Build Merger (Role) [Wed, 28 Feb 2018 18:33:03 +0000 (18:33 +0000)]
Merge "Merge "Delay starting the webview_zygote until first use." am:
6d9d717ab7 am:
99440a0ab8 am:
92697692b3"
Robert Sesek [Wed, 28 Feb 2018 18:32:39 +0000 (18:32 +0000)]
Merge "Delay starting the webview_zygote until first use." am:
6d9d717ab7 am:
99440a0ab8
am:
92697692b3
Change-Id: I4f810427f083d9b7874df7d90fc00a33967d9323
TreeHugger Robot [Wed, 28 Feb 2018 18:32:23 +0000 (18:32 +0000)]
Merge "Log app start memory state in background"
Leon Scroggins III [Wed, 28 Feb 2018 18:23:32 +0000 (13:23 -0500)]
Fixes for YuvToJpegEncoder::encode
Bug:
70969260
Test: Existing CTS tests
Call jpeg_destroy_compress after compression (and failure), eliminating
a memory leak.
In addition, use a custom method for handling errors. skjpeg_error_exit
was previously used, but that method expects a skjpeg_error_mgr, which
isn't used here. skjpeg_error_mgr is more complex than necessary; it
allows for multiple methods to set their own jmp_bufs, even if they call
each other. The entire compression here is contained in one method. The
code for handling this single jmp_buf is simple, so no need to share
code.
This is a follow-on to If9a33ed10ea60131906a632a7030e0b69a21f4ea, which
removed skjpeg_error_mgr, but incorrectly left the skjpeg_error_exit.
Change-Id: Ib76e07ae0d29b093d3709f60e427b18e0e32bd9d
TreeHugger Robot [Wed, 28 Feb 2018 18:23:47 +0000 (18:23 +0000)]
Merge "Update Slice.Builder#addInt javadoc."
Etan Cohen [Thu, 22 Feb 2018 23:54:20 +0000 (15:54 -0800)]
[AWARE] Add target API check to the Responder to ANYONE config
Responder to ANYONE was deprecated for API >= P. But the manager
code did not check for target API - i.e. even older apps would have
been rejected. Added the target API check to the manager code.
Bug:
72175022
Test: unit test + integration tests
Change-Id: I52e0c877e0af0756816b5b13e42f432504461e20
Holly Jiuyu Sun [Wed, 28 Feb 2018 18:18:04 +0000 (18:18 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi."
Robert Sesek [Wed, 28 Feb 2018 18:16:43 +0000 (18:16 +0000)]
Merge "Delay starting the webview_zygote until first use." am:
6d9d717ab7
am:
99440a0ab8
Change-Id: Icf9297f730bc4fa779d989eccc05e436c5d463b6
Robert Sesek [Wed, 28 Feb 2018 18:07:09 +0000 (18:07 +0000)]
Merge "Delay starting the webview_zygote until first use."
am:
6d9d717ab7
Change-Id: I7a2c485fcf04a5728081f99610435a970dc4bb1b
Lucas Dupin [Tue, 27 Feb 2018 19:32:16 +0000 (11:32 -0800)]
Reset bouncer instead of just hiding it
We can't just hide the view because the state should
be propagated to other parts of the system.
Test: show bouncer, launch camera
Change-Id: I76bb316a117d9a017b55d56a0e0750586e4f81fa
Fixes:
73905701
Todd Kennedy [Thu, 22 Feb 2018 22:15:18 +0000 (14:15 -0800)]
Add component ordering
When multiple activities match the same Intent, allow app developers
to reorder matched results within their own application. This is not
a replacement for priority which reorders matched results between
applications.
Change-Id: I12ee987622e12e40d6b5b48f616cc362d01381de
Fixes:
64582537
Test: atest -it CtsAppSecurityHostTestCases:PackageResolutionHostTest
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"
Ng Zhi An [Tue, 20 Feb 2018 17:02:14 +0000 (09:02 -0800)]
Log app start memory state in background
Bug:
73379331
Test: refactoring, unit tests pass
adb logcat -b events | grep "319,"
adb logcat -b stats | grep "55,"
Change-Id: Id959b1b6ce547b9155c72e6734a32b54a2d3a64a
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 16:02:58 +0000 (16:02 +0000)]
Merge "Delay starting the webview_zygote until first use."
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
Andrii Kulian [Wed, 14 Feb 2018 21:48:56 +0000 (13:48 -0800)]
Use post-execution state for lifecycle callback sequences
onActivityResult callback should always be executed before onResume.
If an activity is in the process of starting or creation, it can be
executed after onStart. If an activity was already resumed, then we
should pause it first, execute onActivityResult, then resume again.
So there are two valid pre-execute states - onStart and onPause.
For cases like the one described above this CL uses post-execution
state to identify valid pre-execute states and will try to use the
one that is closer to the current activity state during execution.
It also moves activity result and new intent callbacks into the same
transaction as the resumed state request, so that all changes can be
handled appropriately on the client side.
Bug:
72547861
Bug:
73348613
Test: TransactionExecutorTests
Test: ActivityLifecycleTests
Change-Id: I0af457d305c73a640040b8b7aee46dbbdfa6038f
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
Holly Jiuyu Sun [Thu, 22 Feb 2018 04:34:22 +0000 (20:34 -0800)]
Mark EUICC_PROVISIONED as @SystemApi.
Bug:
35851809
Test: test on phone
Merged-In: I1627aeaf6846e889767fb4223c46fa278a751b23
Change-Id: I1627aeaf6846e889767fb4223c46fa278a751b23
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