OSDN Git Service
Peiyong Lin [Thu, 21 Mar 2019 20:53:42 +0000 (20:53 +0000)]
Revert "Allow screenshot to carry more information."
This reverts commit
42d5d0322af0157bf1b1b9306f1f75309108a002.
Below is the original commit message:
Previously screenshot returns a GraphicBuffer without any other information
about how to interpret this buffer, especially color space. We could not take
any WCG screenshot, and the color space information is also lost by the time we
create bitmap from the GraphicBuffer. This patch adds a ScreenshotGraphicBuffer
as a wrapper around GraphicBuffer with more information, for example color
space. And make screenshot native method return ScreenshotGraphicBuffer.
BUG:
116112787
Test: Build, flash and boot. Verify with WCG Photos.
Reason for revert: Break master build
Change-Id: I36efb7a1274bdcd31b6a7f1070a96d522c0f124a
Peiyong Lin [Tue, 12 Mar 2019 16:42:25 +0000 (09:42 -0700)]
Allow screenshot to carry more information.
Previously screenshot returns a GraphicBuffer without any other information
about how to interpret this buffer, especially color space. We could not take
any WCG screenshot, and the color space information is also lost by the time we
create bitmap from the GraphicBuffer. This patch adds a ScreenshotGraphicBuffer
as a wrapper around GraphicBuffer with more information, for example color
space. And make screenshot native method return ScreenshotGraphicBuffer.
BUG:
116112787
Test: Build, flash and boot. Verify with WCG Photos.
Change-Id: I03cc5ce76d13f165c1203ced0b7fefc570dd2096
Adam Bookatz [Mon, 18 Mar 2019 16:38:47 +0000 (16:38 +0000)]
Merge "UserManager.setUserName: clearCallingId pre-Broadcast"
TreeHugger Robot [Mon, 18 Mar 2019 15:49:45 +0000 (15:49 +0000)]
Merge "Initialize a11y transforms when device is booted"
Ruslan Tkhakokhov [Mon, 18 Mar 2019 15:10:04 +0000 (15:10 +0000)]
Merge changes from topic "api-review-restore-packages"
* changes:
API Review: Internal RestoreSession#restorePackages
API Review: RestoreSession#restoreSomePackages
Andrei-Valentin Onea [Mon, 18 Mar 2019 15:08:31 +0000 (08:08 -0700)]
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am:
09426de69d am:
4bd5774611
am:
abea8411b5 -s ours
am skip reason: change_id I4ece0a3f37f88fc2508cb965092aed7cabc61819 with SHA1
24ec321bf3 is in history
Change-Id: I8d48fe483febc5983e59b098c67e8f778f461d4d
Andrei-Valentin Onea [Mon, 18 Mar 2019 14:59:22 +0000 (07:59 -0700)]
Merge "Add @UnsupportedAppUsage annotations" am:
09426de69d
am:
4bd5774611
Change-Id: Ibf3acf98e452060afa8975b6f91a8921c0032e80
Ryan Mitchell [Mon, 18 Mar 2019 14:50:00 +0000 (14:50 +0000)]
Merge "Fix system policy to mean overlays on /system"
Andrei-Valentin Onea [Mon, 18 Mar 2019 14:49:55 +0000 (07:49 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
09426de69d
Change-Id: I8be4fa32c92a5b5ac335bfbfa0a6edffcb881b22
Andrei-Valentin Onea [Mon, 18 Mar 2019 14:40:25 +0000 (14:40 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
TreeHugger Robot [Mon, 18 Mar 2019 14:06:32 +0000 (14:06 +0000)]
Merge "Fix curly brackets in Notification.java"
Hyundo Moon [Mon, 18 Mar 2019 13:04:00 +0000 (06:04 -0700)]
Merge "Add hdmoon@/insun@ to OWNERS" am:
3923ce61f6 am:
9edcff5c2c
am:
214a729b6d
Change-Id: I5af2fd7e32fee1ca9930a1085f343e0dfd81d366
Hyundo Moon [Mon, 18 Mar 2019 12:54:45 +0000 (05:54 -0700)]
Merge "Add hdmoon@/insun@ to OWNERS" am:
3923ce61f6
am:
9edcff5c2c
Change-Id: I5ffde3e47d8aa073557dd2d3f6f5c78990a9721c
Hyundo Moon [Mon, 18 Mar 2019 12:45:41 +0000 (05:45 -0700)]
Merge "Add hdmoon@/insun@ to OWNERS"
am:
3923ce61f6
Change-Id: I09c4bdceb218c32c152c4faa7d80dd51b3e6ebba
Hyundo Moon [Mon, 18 Mar 2019 12:32:01 +0000 (12:32 +0000)]
Merge "Add hdmoon@/insun@ to OWNERS"
Ruslan Tkhakokhov [Mon, 11 Mar 2019 16:26:17 +0000 (16:26 +0000)]
API Review: Internal RestoreSession#restorePackages
Bug:
120843781
Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest CtsBackupTestCases
3) atest CtsBackupHostTestCases
4) atest GtsBackupTestCases
5) atest GtsBackupHostTestCases
Change-Id: Ice42aedd702e1c16b074d7a00d7b15d8f4aaf733
Andrei Onea [Mon, 18 Mar 2019 11:37:25 +0000 (11:37 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.os
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I4ece0a3f37f88fc2508cb965092aed7cabc61819
Change-Id: I0d942254f06c1a355fb906640e223ad34cced6ab
Gustav Sennton [Mon, 18 Mar 2019 11:41:11 +0000 (11:41 +0000)]
Fix curly brackets in Notification.java
Test: N/A
Change-Id: I3c46a8d4b0e68e3ca2859529fa93aa36c2c56b28
Ruslan Tkhakokhov [Mon, 11 Mar 2019 10:23:19 +0000 (10:23 +0000)]
API Review: RestoreSession#restoreSomePackages
1. Rename restoreSome to restorePackages
2. Add @Nullable annotation for BackupObserver, BackupManagerMonitor and @NonNull for 'packages' params
3. Update javadoc to reflect the difference between BackupObserver and BackupManagerMonitor
4. Change 'packages' param from String[] to Set
Bug:
120843781
Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest CtsBackupTestCases
3) atest CtsBackupHostTestCases
4) atest GtsBackupTestCases
5) atest GtsBackupHostTestCases
Change-Id: I433739c0b1e62059b10593c233dfb2f461a8630e
Andrei-Valentin Onea [Mon, 18 Mar 2019 10:56:26 +0000 (10:56 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Olivier Gaillard [Mon, 18 Mar 2019 10:19:24 +0000 (10:19 +0000)]
Merge "Fix end-to-end value metrics tests."
Hyundo Moon [Mon, 18 Mar 2019 10:03:07 +0000 (10:03 +0000)]
Merge "Remove ControllerLink"
TreeHugger Robot [Mon, 18 Mar 2019 07:52:00 +0000 (07:52 +0000)]
Merge "Log the correct oom_adj when compacting apps."
Riddle Hsu [Fri, 15 Mar 2019 12:26:27 +0000 (20:26 +0800)]
Only show the toast of dismissing docked stack if it actually happens
When launching a non-resizable activity on secondary display, an overlay
activity will show "App may not work on a secondary display" on it.
Because the overlay activity is resizable, it is nothing to handle on
secondary display. But it falls to the condition of split-screen, and
even there is no docked stack, the toast of dismissing docked stack is
still shown.
Bug:
128674132
Test: atest ActivityStackSupervisorTests# \
testHandleNonResizableTaskOnSecondaryDisplay
Change-Id: I1b8fe892ec4cace4f87112f132e0eefdae19024d
TreeHugger Robot [Mon, 18 Mar 2019 04:49:15 +0000 (04:49 +0000)]
Merge "Format relative time with specific style"
tmfang [Sat, 9 Mar 2019 07:24:01 +0000 (15:24 +0800)]
Format relative time with specific style
In some cases, we expect the relative time in a short
format. So, we make this method can input a format style.
Fixes:
126871866
Test: visual
Change-Id: Iba5fb8d3acbf357b8c7d54065abf3e2fd74fac03
Remi NGUYEN VAN [Mon, 18 Mar 2019 02:12:02 +0000 (19:12 -0700)]
Merge "Remove NetworkParcelable" am:
205886d28f am:
7201f61c57
am:
13be9e9fcd
Change-Id: Ifec0dd683bf9c9b73c4af12835b76d284559daf8
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:59:43 +0000 (18:59 -0700)]
Merge "Remove aidl wrappers for framework parcelables" am:
1a1396070e am:
7cf43a2f53
am:
5fd40295cb
Change-Id: I019fbbfd5dde5268cbb38bdaee1bc50a434372bc
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:55:26 +0000 (18:55 -0700)]
Merge "Remove NetworkParcelable" am:
205886d28f
am:
7201f61c57
Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:50:17 +0000 (18:50 -0700)]
Merge "Remove aidl wrappers for framework parcelables" am:
1a1396070e
am:
7cf43a2f53
Change-Id: I41a07768ec8d9af2b7f16d86ee074c206b153b0c
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:44:58 +0000 (18:44 -0700)]
Merge "Remove NetworkParcelable"
am:
205886d28f
Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:41:05 +0000 (18:41 -0700)]
Merge "Remove aidl wrappers for framework parcelables"
am:
1a1396070e
Change-Id: Ib69a20153754018c951f504b5f14e91074526144
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:30:25 +0000 (01:30 +0000)]
Merge "Remove NetworkParcelable"
Remi NGUYEN VAN [Mon, 18 Mar 2019 01:30:01 +0000 (01:30 +0000)]
Merge "Remove aidl wrappers for framework parcelables"
TreeHugger Robot [Mon, 18 Mar 2019 01:06:13 +0000 (01:06 +0000)]
Merge "Update connected display config on settings load."
TreeHugger Robot [Sun, 17 Mar 2019 23:22:21 +0000 (23:22 +0000)]
Merge "WM: Promote TaskPositioningControllerTests and ZOrderingTests to non-flaky"
TreeHugger Robot [Sun, 17 Mar 2019 22:46:09 +0000 (22:46 +0000)]
Merge "Input: Override touchable region bounds with surface bounds 1/2"
Jeff Sharkey [Sun, 17 Mar 2019 20:46:48 +0000 (20:46 +0000)]
Merge "Wire up getStorageVolume() for synthetic paths."
Jeff Sharkey [Sun, 17 Mar 2019 19:12:10 +0000 (13:12 -0600)]
Wire up getStorageVolume() for synthetic paths.
When a getStorageVolume(File) call is for a synthetic path backed
by a content:// Uri, translate it and call getStorageVolume(Uri).
Bug:
124700423
Test: manual
Change-Id: I0f0dc4d5c2205e9d602e4ec2b036fb7822ba1e33
Jeff Sharkey [Sun, 17 Mar 2019 18:24:14 +0000 (12:24 -0600)]
Fix synthetic RingtoneManager column.
It was querying a column that didn't exist internally; instead it
needs to fake that value for its clients.
Bug:
128349496
Test: atest android.media.cts.RingtoneTest
Change-Id: I7c3738cdb21ac5c92df55a8622b24f5c6a118154
Jeff Sharkey [Sun, 17 Mar 2019 17:05:53 +0000 (11:05 -0600)]
Fix recent ExifInterface regression.
It needs to open files using absolute path, not relative path.
Bug:
128782519
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I173b7b5dcb3c351b8554547e89e5441f9bdb19d1
Jeff Sharkey [Sun, 17 Mar 2019 17:05:32 +0000 (11:05 -0600)]
Add exception logging to aid debugging.
Now we log both success and failure of ContentInterface calls.
Bug:
128782519
Test: manual
Change-Id: I5e81cc6a8ba1460331cad5e085aa01633d6741d6
TreeHugger Robot [Sun, 17 Mar 2019 01:02:11 +0000 (01:02 +0000)]
Merge "Allow transitioning through lifecycle when finished"
TreeHugger Robot [Sat, 16 Mar 2019 18:56:36 +0000 (18:56 +0000)]
Merge "Address API review comments"
Winson Chung [Sat, 16 Mar 2019 17:37:38 +0000 (17:37 +0000)]
Merge "Add mechanism for freezing the system recent task list"
Abodunrinwa Toki [Sat, 16 Mar 2019 17:11:12 +0000 (17:11 +0000)]
Merge "Include language information in intents from the TextClassifier."
Evan Laird [Sat, 16 Mar 2019 16:18:16 +0000 (09:18 -0700)]
Merge "revent NFE in SystemUI when parsing invalid int (2)" am:
a5f53a59c7 am:
fd19257a76
am:
4da6983197
Change-Id: Ibc7a143c6db3d9ca2ac79bc06876136399f4d54b
Evan Laird [Sat, 16 Mar 2019 16:09:09 +0000 (09:09 -0700)]
Merge "revent NFE in SystemUI when parsing invalid int (2)" am:
a5f53a59c7
am:
fd19257a76
Change-Id: Ib0796abe20485873dec2772f57dbd8cedd255dfa
Evan Laird [Sat, 16 Mar 2019 15:52:16 +0000 (08:52 -0700)]
Merge "revent NFE in SystemUI when parsing invalid int (2)"
am:
a5f53a59c7
Change-Id: I1b0b6e8c7c01cf02426d1cbeec9196b285d6283a
Evan Laird [Sat, 16 Mar 2019 15:43:04 +0000 (15:43 +0000)]
Merge "revent NFE in SystemUI when parsing invalid int (2)"
Tony Mak [Sat, 16 Mar 2019 10:28:42 +0000 (10:28 +0000)]
Include language information in intents from the TextClassifier.
This CL runs langid on classifyText() and sets the language information
of the classified text in Intent extras that are sent to the destination
app. If the text is too small for langId to detect the text reliably,
include surrounding text as necessary.
Includes flags to tune/disable how sorrounding text is used.
Also fixes failing tests.
Bug:
126453204
Test: atest android.view.textclassifier
Change-Id: I9ef2a33690dc3787f6544ceed0f41c527f4423e5
TreeHugger Robot [Sat, 16 Mar 2019 10:09:20 +0000 (10:09 +0000)]
Merge "Support copy action in ExtServices"
TreeHugger Robot [Sat, 16 Mar 2019 10:09:20 +0000 (10:09 +0000)]
Merge "Populate entities information to extras and add copy action"
TreeHugger Robot [Sat, 16 Mar 2019 07:27:16 +0000 (07:27 +0000)]
Merge "Fix AppOps API review bugs."
TreeHugger Robot [Sat, 16 Mar 2019 06:12:26 +0000 (06:12 +0000)]
Merge "Removed "forUser" variants in NotificationManager"
Mingguang Xu [Sat, 16 Mar 2019 06:02:02 +0000 (06:02 +0000)]
Merge "Wifi usability: Add expected range for Wi-Fi usability score"
TreeHugger Robot [Sat, 16 Mar 2019 03:46:32 +0000 (03:46 +0000)]
Merge "Apply show or hide transaction for InputSurface immediately"
sqian [Sat, 16 Mar 2019 03:20:28 +0000 (20:20 -0700)]
Merge "CallRedirectionService API review" am:
1276a178fd am:
de633a49f1
am:
b09f8d20e3
Change-Id: I184b51e7aa8816fd0e46d2492222cf617b13eba5
Josh Gao [Sat, 16 Mar 2019 03:12:09 +0000 (20:12 -0700)]
Merge "ParcelFileDescriptor: improve javadoc." am:
c4e2b24d87 am:
bc7222d46d
am:
b578ef38ed
Change-Id: I031c3238d57583bf0d041f00fa33e586d5984316
TreeHugger Robot [Sat, 16 Mar 2019 03:08:32 +0000 (03:08 +0000)]
Merge "Dump cec related information in AudioService"
sqian [Sat, 16 Mar 2019 03:07:25 +0000 (20:07 -0700)]
Merge "CallRedirectionService API review" am:
1276a178fd
am:
de633a49f1
Change-Id: Iedac1e363872fc390df007d5b4e977c03e725bdf
TreeHugger Robot [Sat, 16 Mar 2019 03:05:47 +0000 (03:05 +0000)]
Merge "Fix profile gpu bars to use display fps"
Mathieu Chartier [Sat, 16 Mar 2019 03:04:33 +0000 (03:04 +0000)]
Merge "Add extra docs for RUNTIME_NATIVE"
TreeHugger Robot [Sat, 16 Mar 2019 03:03:26 +0000 (03:03 +0000)]
Merge "Use IntFunction for inspector flag and enum mapping"
Josh Gao [Sat, 16 Mar 2019 03:02:34 +0000 (20:02 -0700)]
Merge "ParcelFileDescriptor: improve javadoc." am:
c4e2b24d87
am:
bc7222d46d
Change-Id: I4a6d999b503985a84f44ad487bb36a505d80de6a
TreeHugger Robot [Sat, 16 Mar 2019 03:00:35 +0000 (03:00 +0000)]
Merge "Added android.service.contentcapture.ActivityEvent.TYPE_ACTIVITY_STOPPED"
sqian [Sat, 16 Mar 2019 02:56:23 +0000 (19:56 -0700)]
Merge "CallRedirectionService API review"
am:
1276a178fd
Change-Id: I4509bfabae430b97ee82c2939b9099dc5767f44a
Josh Gao [Sat, 16 Mar 2019 02:52:34 +0000 (19:52 -0700)]
Merge "ParcelFileDescriptor: improve javadoc."
am:
c4e2b24d87
Change-Id: Ic01db5d3f9c7527f2458aa4cf10bd2c43d685bed
Treehugger Robot [Sat, 16 Mar 2019 02:42:29 +0000 (02:42 +0000)]
Merge "CallRedirectionService API review"
Treehugger Robot [Sat, 16 Mar 2019 02:36:30 +0000 (02:36 +0000)]
Merge "ParcelFileDescriptor: improve javadoc."
TreeHugger Robot [Sat, 16 Mar 2019 02:31:25 +0000 (02:31 +0000)]
Merge "Remove the @remove from the deprecated registerUsageSessionObserver"
TreeHugger Robot [Sat, 16 Mar 2019 02:13:54 +0000 (02:13 +0000)]
Merge "Fixed Augmented Autofill workflow so the UI is closed when another field is focused."
TreeHugger Robot [Sat, 16 Mar 2019 02:01:01 +0000 (02:01 +0000)]
Merge "Fallback to legacy intent factory when the template is null"
Patrick Huang [Sat, 16 Mar 2019 01:45:23 +0000 (01:45 +0000)]
Merge "Document permissions for euicc privileged actions."
TreeHugger Robot [Sat, 16 Mar 2019 01:43:43 +0000 (01:43 +0000)]
Merge "Adjust how force-dark is enabled"
TreeHugger Robot [Sat, 16 Mar 2019 01:31:13 +0000 (01:31 +0000)]
Merge "AudioService: fix death linking for external audio policy"
chaviw [Fri, 15 Mar 2019 20:31:08 +0000 (13:31 -0700)]
Apply show or hide transaction for InputSurface immediately
Currently, the show or hide is added to a transaction when the
updateInputWindows runnable is executed asynchronously. This could cause
a delay when the input surface is sent to SurfaceFlinger, causing issues
with input that occurs after the input surface is expected to have been
created.
This change applies the show and hide transaction immediately so when
the performDrag returns to the client the surface has already been
added. Since the input surface is not tied to the windows, applying it
doesn't need to be in sync with applying the other transactions.
Bug:
122965081
Test: atest DragDropTest
Change-Id: I90d67116b8e4f15eed4f98a8fa593861164ea0c5
Garfield Tan [Thu, 14 Mar 2019 21:50:59 +0000 (14:50 -0700)]
Update connected display config on settings load.
Bug:
128354502
Test: Manual test.
atest DisplayWindowSettingsTests
atest RootWindowContainerTests
Change-Id: I2b85735d4b27516f5cb69d34592ae856208df25e
TreeHugger Robot [Sat, 16 Mar 2019 00:57:55 +0000 (00:57 +0000)]
Merge "Do not ignore runID in SRTTrack"
Tony Mak [Fri, 1 Mar 2019 18:25:23 +0000 (18:25 +0000)]
Populate entities information to extras and add copy action
Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/
BUG:
126193140
Change-Id: I847b2fd747393f1c8e25d802f6d9b1fd628c92e4
TreeHugger Robot [Sat, 16 Mar 2019 00:25:27 +0000 (00:25 +0000)]
Merge "Full bucket should be reset even when the last bucket is invalid."
Tyler Gunn [Sat, 16 Mar 2019 00:18:40 +0000 (17:18 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis." am:
90723afa47 am:
545bace60f
am:
77b1dfa56a
Change-Id: I54a446eaf8c22149f6df5c2f677eb8b5072deda6
TreeHugger Robot [Sat, 16 Mar 2019 00:11:17 +0000 (00:11 +0000)]
Merge "MediaPlayer: fix use after free for mMediaTimeProvider"
Tyler Gunn [Sat, 16 Mar 2019 00:09:27 +0000 (17:09 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis." am:
90723afa47
am:
545bace60f
Change-Id: If429c8987bdda6ade37364cc116ff0fcd01315a2
Nikita Ioffe [Sat, 16 Mar 2019 00:07:27 +0000 (00:07 +0000)]
Merge "Properly fail commit of a new staged session if another one is in progress"
Jack Yu [Fri, 15 Mar 2019 23:53:51 +0000 (16:53 -0700)]
[automerger skipped] Merge "Moved transport to IntDef" am:
b7463a63d1 am:
f713c1ff26
am:
bc8cc99b20 -s ours
am skip reason: change_id I1b513bcaaa0ebf47c14593d962579ed48a7c6db0 with SHA1
ef25faf013 is in history
Change-Id: Iae5ff42920f769ecfc9de290f513bd926e4de77b
Tyler Gunn [Fri, 15 Mar 2019 23:51:04 +0000 (16:51 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis."
am:
90723afa47
Change-Id: If983c7a0351138fcfb35d9060b0c17c7b9e2c69f
John Reck [Fri, 15 Mar 2019 23:36:01 +0000 (16:36 -0700)]
Fix profile gpu bars to use display fps
Also adds a 'good' bar at 80% threshold
and a 'bad' bar at 150% threshold (where triple
buffering would start to get iffy)
Fixes:
127371028
Test: eyeball'd it
Change-Id: I109cd293f87f8cb9c8f1e66d49fb8fb2188b0bec
Sasha Smundak [Fri, 15 Mar 2019 23:41:01 +0000 (16:41 -0700)]
Merge "Convert Android.mk file to Android.bp" am:
504a33a64e am:
c35c355dbb
am:
c78d2ff15f
Change-Id: I88fe73e11421204c4f0b2e20b91088cf91bdaa13
Jack Yu [Fri, 15 Mar 2019 23:40:23 +0000 (16:40 -0700)]
Merge "Moved transport to IntDef" am:
b7463a63d1
am:
f713c1ff26
Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
Tyler Gunn [Fri, 15 Mar 2019 23:36:21 +0000 (23:36 +0000)]
Merge "Cleanup unsupported appusage in Telecom apis."
Android Build Merger (Role) [Fri, 15 Mar 2019 23:34:36 +0000 (23:34 +0000)]
Merge "Merge "[API feedback] api fixed for getSlotMapping" am:
9931252c3f am:
58fed7fac6 am:
91ae15122f"
Pengquan Meng [Fri, 15 Mar 2019 23:34:10 +0000 (16:34 -0700)]
Merge "[API feedback] api fixed for getSlotMapping" am:
9931252c3f am:
58fed7fac6
am:
91ae15122f
Change-Id: I08c80e60a89ab359c83e4043a1dfb74c92dc0b8a
TreeHugger Robot [Fri, 15 Mar 2019 23:31:59 +0000 (23:31 +0000)]
Merge "Fix typo in jstring signature definition"
Jack Yu [Fri, 15 Mar 2019 23:31:06 +0000 (16:31 -0700)]
Merge "Moved transport to IntDef"
am:
b7463a63d1
Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
TreeHugger Robot [Fri, 15 Mar 2019 23:27:35 +0000 (23:27 +0000)]
Merge "Revert "Always suppress font error during resource loading""
Robert Shih [Fri, 15 Mar 2019 23:25:49 +0000 (23:25 +0000)]
Merge "MediaDrm: [Security,Hdcp]Level @deprecated javadoc"
TreeHugger Robot [Fri, 15 Mar 2019 23:23:25 +0000 (23:23 +0000)]
Merge "Add annotation for EuiccManager#updateSubscriptionNickname."
Treehugger Robot [Fri, 15 Mar 2019 23:21:29 +0000 (23:21 +0000)]
Merge "Moved transport to IntDef"
Yuanjia Hsu [Fri, 15 Mar 2019 23:16:02 +0000 (23:16 +0000)]
Merge "Temporarily pre-grant permission with STOPSHIP"