OSDN Git Service
Chenjie Yu [Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev
am:
60a24b97f7
Change-Id: I45399dc23e13fc7030a66f6d6166d6f2434640ba
Erik Kline [Tue, 3 Apr 2018 04:53:07 +0000 (21:53 -0700)]
[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev
am:
5a36b3b6ea -s ours
Change-Id: I2a970420521d9447d71dedb373bcf3098afd3d02
Sanry Huang [Tue, 3 Apr 2018 04:45:31 +0000 (21:45 -0700)]
Merge "android:ui crash on longpress of empty tile" into pi-dev
am:
7a8aac8c6e
Change-Id: I49deb50169e0245025caceb5bdf65f515f45ce8f
Dmitry Dementyev [Tue, 3 Apr 2018 04:36:05 +0000 (21:36 -0700)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
am:
41d6d7c424
Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1
Kweku Adams [Tue, 3 Apr 2018 04:21:31 +0000 (21:21 -0700)]
Merge "Disabling print dumping for now." into pi-dev
am:
4df40c827e
Change-Id: I8c44090b1f84a45d8a1a0e8a952cc540d54eacfb
Chen Xu [Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)]
Merge "A test api to override carrier information" into pi-dev
am:
b71c76036c
Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e
Brad Stenning [Tue, 3 Apr 2018 03:41:26 +0000 (20:41 -0700)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
am:
1e617f5c20
Change-Id: Ifeccb66d335bc5413861732dfd434eea46ea53dc
Bo Zhu [Tue, 3 Apr 2018 03:36:36 +0000 (20:36 -0700)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev
am:
1364455fd7
Change-Id: I6fc53616ec67bbb2770541958745d10f766f8b3d
Brad Stenning [Tue, 3 Apr 2018 03:31:58 +0000 (20:31 -0700)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
am:
943b315668
Change-Id: Ibbcfd7e79a81ec5961a8997cf5d209076d4fe43d
Gil O'Neil [Tue, 3 Apr 2018 03:27:23 +0000 (20:27 -0700)]
Merge "Made a note that app names may not contain delimiter characters" into pi-dev
am:
c610677258
Change-Id: I9581a7af5f34111ee3608f3ec2088fc9b0fffdcd
Fyodor Kupolov [Tue, 3 Apr 2018 03:22:44 +0000 (20:22 -0700)]
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am:
4921986db7 am:
609bc2d63e am:
3f13ccee8c -s ours" into pi-dev
am:
3e8e71d1ec -s ours
Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b
Remi NGUYEN VAN [Tue, 3 Apr 2018 03:15:50 +0000 (20:15 -0700)]
[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev
am:
cccd67b574 -s ours
Change-Id: I49845b0bc0183d4d1a6c694a70e30a90a9a59759
Yin-Chia Yeh [Tue, 3 Apr 2018 03:05:25 +0000 (20:05 -0700)]
Merge "Camera: fix errorFlag logic" into pi-dev
am:
4ccefebb78
Change-Id: I179c350218f4c5083a32c043f86e8b30f428d4da
Jovana Knezevic [Tue, 3 Apr 2018 02:58:05 +0000 (19:58 -0700)]
Merge "Adding user accessor functions to UserManagerHelper." into pi-dev
am:
c3724b5e91
Change-Id: If7acce092d6360ca64f1a4115ebd59ef8d185435
Mihai Popa [Tue, 3 Apr 2018 02:53:48 +0000 (19:53 -0700)]
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
am:
285797a45a
Change-Id: I81474f04a8d33d2cf063aa0d89b7abca255d3864
Derek Sollenberger [Tue, 3 Apr 2018 02:49:15 +0000 (19:49 -0700)]
Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev
am:
8ec341627c
Change-Id: I9c3ac77a3743afe6980cdaca8ce324d4913945b9
Lorenzo Colitti [Tue, 3 Apr 2018 02:37:19 +0000 (19:37 -0700)]
Merge "Allow applications to query for foreground/background data usage." into pi-dev
am:
3cafea0701
Change-Id: I755f6d28c3e881fb2f6ee864f63eb2a080a1045d
TreeHugger Robot [Tue, 3 Apr 2018 02:31:27 +0000 (02:31 +0000)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev
Rob Carr [Tue, 3 Apr 2018 02:30:01 +0000 (19:30 -0700)]
Merge changes Ia9df12fa,Ib114e8cb into pi-dev
am:
d8bfc71c6c
Change-Id: Iaf70839958e257d195cb0538b1951771a0c7790b
TreeHugger Robot [Tue, 3 Apr 2018 02:25:49 +0000 (02:25 +0000)]
Merge "Refactor isTetheringSupported() calls" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 02:22:48 +0000 (02:22 +0000)]
Merge "android:ui crash on longpress of empty tile" into pi-dev
Daniel Cashman [Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)]
Merge "Add ROLLBACK past signing cert capability." into pi-dev
am:
0594af6dc3
Change-Id: I4057024e5a9369f0dc9c5e3ada14d338202fb1c6
Android Build Merger (Role) [Tue, 3 Apr 2018 01:59:52 +0000 (01:59 +0000)]
Merge changes from topic "am-
8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
* changes:
Merge changes from topic "planz" into pi-dev am:
93e11759d6
Obtain NPMS through helper method. am:
a435ab5124
Jeff Sharkey [Tue, 3 Apr 2018 01:59:01 +0000 (18:59 -0700)]
Merge changes from topic "planz" into pi-dev
am:
93e11759d6
Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858
TreeHugger Robot [Tue, 3 Apr 2018 01:55:30 +0000 (01:55 +0000)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
Jeff Sharkey [Tue, 3 Apr 2018 01:52:26 +0000 (18:52 -0700)]
Obtain NPMS through helper method.
am:
a435ab5124
Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc
Hall Liu [Tue, 3 Apr 2018 01:46:50 +0000 (18:46 -0700)]
Merge "Change signature of requestBluetoothAudio" am:
545e20389d
am:
442575f4f1
Change-Id: Ic10b762e04d74635663fa97f5879072ebe00eca9
TreeHugger Robot [Tue, 3 Apr 2018 01:36:23 +0000 (01:36 +0000)]
Merge "Disabling print dumping for now." into pi-dev
Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]
Merge "Change signature of requestBluetoothAudio"
am:
545e20389d
Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c
Brian C. Young [Tue, 3 Apr 2018 01:29:11 +0000 (18:29 -0700)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
am:
084f9aee9a
Change-Id: Icb6580e3c7ee5a1b5cbacbd99eb769e3f55b5d9a
Todd Kennedy [Tue, 3 Apr 2018 01:20:20 +0000 (18:20 -0700)]
Merge "Exit the loop at the right time" into pi-dev
am:
6d24a1c8be
Change-Id: Idbf0953a3fb4dd38640009a0b213dace99a282c5
Chen Xu [Tue, 3 Apr 2018 01:14:24 +0000 (01:14 +0000)]
Merge "A test api to override carrier information" into pi-dev
Dianne Hackborn [Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
am:
886fc6aef0
Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd
Lucas Dupin [Tue, 3 Apr 2018 00:46:39 +0000 (17:46 -0700)]
Merge "Remove old alarm IPC" into pi-dev
am:
ae6b800562
Change-Id: I60977022c6075e1fa3aa27156733eb41891e5b26
Shawn Willden [Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)]
Merge "Rename trustedUserPresenceRequired." into pi-dev
am:
840c29eb0b
Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6
TreeHugger Robot [Tue, 3 Apr 2018 00:30:34 +0000 (00:30 +0000)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
Bo Zhu [Tue, 3 Apr 2018 00:28:43 +0000 (00:28 +0000)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 00:25:47 +0000 (00:25 +0000)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
Bryce Lee [Tue, 3 Apr 2018 00:24:11 +0000 (00:24 +0000)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev
am:
540f747861
Change-Id: Ida4807ded086a070e2e905f03d298ffd4c6ab98b
Dmitry Dementyev [Tue, 3 Apr 2018 00:16:20 +0000 (00:16 +0000)]
Revert "Throw invalid cert exception when deprecated initRecoveryService method"
This reverts commit
50bc7e42d73c9ca8d77dcd538619c6d6eeaf6dea.
Reason for revert: API is still used by old binary
Change-Id: I3c8348211baa26245786abda6360a8df96e2d223
Bug:
77293264
Jeff Tinker [Tue, 3 Apr 2018 00:16:19 +0000 (00:16 +0000)]
Merge "Updates MediaDrm developer docs" into pi-dev
am:
1c967fe075
Change-Id: I218679fc0cf338389dfb489ba591d3480601280f
Hall Liu [Tue, 3 Apr 2018 00:14:58 +0000 (00:14 +0000)]
Merge "Change signature of requestBluetoothAudio"
Erik Kline [Fri, 9 Mar 2018 05:18:02 +0000 (14:18 +0900)]
Refactor isTetheringSupported() calls
Tethering currently wants access to complex isTetheringSupported
logic that is only available in ConnectivityService. Instead of
trying to access that via ConnectivityManager, pass this capability
in to Tethering directly, in the TetheringDependencies object.
Also:
- ConnectivityManager is only a source of static constants now,
so "import static" all the constants that are actually used.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net works
- manual USB towards WiFi tethering works
Bug:
68951715
Merged-In: Ifa121b057f9959ddb980edc940327929e48ea973
Merged-In: Iad6358dc2f1d10b322d22ec90543adc50882962d
Change-Id: Ia64faaadefb4a5d84a50da98bdebd544b6fda101
(cherry picked from commit
465ff3a0c1da8afd5cb13b25ed9a3c95ee0dd2c4)
Gil O'Neil [Mon, 2 Apr 2018 23:42:01 +0000 (23:42 +0000)]
Merge "Made a note that app names may not contain delimiter characters" into pi-dev
Felipe Leme [Mon, 2 Apr 2018 23:39:03 +0000 (23:39 +0000)]
Merge "Don't use a copy of window params when showing a dialog." into pi-dev
am:
3f6b7714a7
Change-Id: Iaacd371fb0c63eedaab73f32314c14997e578462
Android Build Merger (Role) [Mon, 2 Apr 2018 23:13:36 +0000 (23:13 +0000)]
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am:
4921986db7 am:
609bc2d63e am:
3f13ccee8c -s ours" into pi-dev
Frank Salim [Mon, 2 Apr 2018 23:13:25 +0000 (23:13 +0000)]
Merge "Revise secure key import API after review" into pi-dev
am:
50228a6471
Change-Id: I4fe07806b781d337f2df40f34fb75662187f4360
Fyodor Kupolov [Mon, 2 Apr 2018 23:12:42 +0000 (23:12 +0000)]
[automerger skipped] Use concrete CREATOR instance for parceling lists am:
4921986db7 am:
609bc2d63e
am:
3f13ccee8c -s ours
Change-Id: Id60877e08d928db681e5f47b26e92264996e1e11
Remi NGUYEN VAN [Mon, 2 Apr 2018 23:09:50 +0000 (23:09 +0000)]
Merge "Fix network usage stats on 464xlat tethered." into pi-dev
Brad Stenning [Mon, 2 Apr 2018 22:19:54 +0000 (15:19 -0700)]
Adding a member of Android Auto Embedded to the owners file
Bug:
77493795
Test: none
Change-Id: I3758952b4c51e9b42b787c931377f20035ac4a31
Yi Jin [Mon, 2 Apr 2018 23:07:30 +0000 (23:07 +0000)]
Remove some letters of verbose log
am:
ea31cbea93
Change-Id: Ia1237171d4bcb5c5c86851883f58bbdd1cc7ac22
TreeHugger Robot [Mon, 2 Apr 2018 23:04:42 +0000 (23:04 +0000)]
Merge "Camera: fix errorFlag logic" into pi-dev
Yi Jin [Mon, 2 Apr 2018 23:04:07 +0000 (23:04 +0000)]
Merge "Use modern c++ code style for incidentd." into pi-dev
am:
56051569ab
Change-Id: Ifd36cb23ae185b8a37805deb6163e87a2e9ee1c9
Jovana Knezevic [Mon, 2 Apr 2018 22:59:24 +0000 (22:59 +0000)]
Merge "Adding user accessor functions to UserManagerHelper." into pi-dev
Fyodor Kupolov [Mon, 2 Apr 2018 22:59:23 +0000 (22:59 +0000)]
Use concrete CREATOR instance for parceling lists am:
4921986db7
am:
609bc2d63e
Change-Id: I4d1315586acd143cece0c27c08084012b7b18e22
Andrii Kulian [Mon, 2 Apr 2018 22:58:26 +0000 (22:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
am:
38af02e75b
Change-Id: I8d7d56c9b6d7b1e987379ae26e883a8e1deb2ecf
Sudheer Shanka [Mon, 2 Apr 2018 22:53:08 +0000 (22:53 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
am:
8303baf4d0
Change-Id: Ia476818fee03347c5d0bf80d3197ef391b9f7c66
Bo Zhu [Sun, 1 Apr 2018 19:24:09 +0000 (12:24 -0700)]
Expose the JNI scrypt function in a standalone Java class so we can
use it in RecoverableKeyStore as well
Bug:
77325751
Test: It builds. No caller code yet.
Change-Id: I6ff847cff2efbd023612e51fe35be980f27f162d
Fyodor Kupolov [Mon, 2 Apr 2018 22:46:26 +0000 (22:46 +0000)]
Use concrete CREATOR instance for parceling lists
am:
4921986db7
Change-Id: I935e9a5db9faaf150a6472e49dc5a900bdf30b5a
Mihai Popa [Mon, 2 Apr 2018 22:42:17 +0000 (22:42 +0000)]
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
Brad Stenning [Mon, 2 Apr 2018 22:06:44 +0000 (15:06 -0700)]
Signal view is no loner apart of this fragment
Removing custom battery display functionality until a complete fix
is implemented.
Bug:
77473401
Test: deploy a car build
Change-Id: I3a18ee45d23caa8d2c798cede3e9cb3e7334372f
Derek Sollenberger [Mon, 2 Apr 2018 22:38:50 +0000 (22:38 +0000)]
Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev
Chenjie Yu [Mon, 2 Apr 2018 21:22:19 +0000 (14:22 -0700)]
Add fileds to AppCrash and ANR atoms
Bug:
77487218
Change-Id: I13fe87c9811e248ed0ee87c64d482c9463d6b9a1
Fix:
77487218
Test: cts test
Lorenzo Colitti [Mon, 2 Apr 2018 22:20:03 +0000 (22:20 +0000)]
Merge "Allow applications to query for foreground/background data usage." into pi-dev
Rob Carr [Mon, 2 Apr 2018 22:15:49 +0000 (22:15 +0000)]
Merge changes Ia9df12fa,Ib114e8cb into pi-dev
* changes:
Avoid calling detachChildren from onAppVisibilityChanged
Fix computation of child window insets.
TreeHugger Robot [Mon, 2 Apr 2018 22:07:29 +0000 (22:07 +0000)]
Merge "Add ROLLBACK past signing cert capability." into pi-dev
Kweku Adams [Fri, 30 Mar 2018 23:42:13 +0000 (16:42 -0700)]
Disabling print dumping for now.
Also updating privacy tags.
Bug:
72570451
Bug:
74975371
Test: Android builds
Change-Id: Ia1e6a5d0f5e4f141154fc5346bff432149c9123e
Todd Kennedy [Mon, 2 Apr 2018 21:59:09 +0000 (21:59 +0000)]
Merge "Use per user info for seinfo" into pi-dev
am:
ce5f2b3e87
Change-Id: I01dbd963e683fac472a58d6610fde40dc6fb79f2
TreeHugger Robot [Mon, 2 Apr 2018 21:56:59 +0000 (21:56 +0000)]
Merge changes from topic "planz" into pi-dev
* changes:
Tests for SubscriptionManager APIs.
Obtain NPMS through helper method.
Mike Digman [Mon, 2 Apr 2018 21:51:29 +0000 (21:51 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
am:
78e805684b
Change-Id: I2d038a72bd421832bd242b49e76eda9c16eb0285
Pavel Maltsev [Mon, 2 Apr 2018 21:47:22 +0000 (21:47 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
am:
7f5670fdcd
Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30
TreeHugger Robot [Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
Erik Kline [Mon, 2 Apr 2018 21:08:52 +0000 (21:08 +0000)]
Merge "Refactor isTetheringSupported() calls" am:
e34c426fd3
am:
6f63d051d6
Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d
TreeHugger Robot [Mon, 2 Apr 2018 21:07:37 +0000 (21:07 +0000)]
Merge "Exit the loop at the right time" into pi-dev
Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Refactor isTetheringSupported() calls"
am:
e34c426fd3
Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822
Hall Liu [Mon, 2 Apr 2018 20:52:57 +0000 (13:52 -0700)]
Change signature of requestBluetoothAudio
requestBluetoothAudio now takes a BluetoothDevice instead of a string.
Bug:
74408978
Test: unable to CTS -- can't emulate bluetooth devices
Change-Id: Id21e32b911da234f69a248e9937f9df0cf12a9a9
Dianne Hackborn [Mon, 2 Apr 2018 20:48:51 +0000 (20:48 +0000)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 20:41:24 +0000 (20:41 +0000)]
Merge "Remove old alarm IPC" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 20:36:34 +0000 (20:36 +0000)]
Merge "Rename trustedUserPresenceRequired." into pi-dev
Bryce Lee [Mon, 2 Apr 2018 20:28:00 +0000 (20:28 +0000)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev
Android Build Merger (Role) [Mon, 2 Apr 2018 20:27:43 +0000 (20:27 +0000)]
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am:
ffe1c2a266" into pi-dev-plus-aosp
Derek Sollenberger [Mon, 2 Apr 2018 20:26:38 +0000 (20:26 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
am:
ffe1c2a266
Change-Id: I4dc9a7272aeeda9ae6be5ce9215cc2a4939286fa
Bryce Lee [Mon, 26 Mar 2018 23:03:47 +0000 (16:03 -0700)]
Do not set activity's task before clearing in some scenarios.
When the clear top and reset task launch flags are specified for a
standard launch mode activity, we should not add the activity to the
task before taking these actions. Doing so leads to the potential of
prematurely ending the starting activity and reparenting the activity
without a window container controller set.
This changelist ensures that the task is not associated until later.
Fixes:
70635977
Test: atest CtsActivityManagerDeviceTestCases:ActivityStarterTests
Change-Id: I8e2245f9ad9f07e259b099daefe9ebb2170ae28d
Android Build Merger (Role) [Mon, 2 Apr 2018 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am:
07daad2dbf" into pi-dev-plus-aosp
Remi NGUYEN VAN [Mon, 2 Apr 2018 20:19:22 +0000 (20:19 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev
am:
07daad2dbf
Change-Id: I8fc1a2c491f4518ee835a197a0f5f0cd7ba23543
Android Build Merger (Role) [Mon, 2 Apr 2018 20:15:03 +0000 (20:15 +0000)]
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am:
6e66280d35" into pi-dev-plus-aosp
Chalard Jean [Mon, 2 Apr 2018 20:14:29 +0000 (20:14 +0000)]
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am:
6e66280d35
Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
Daniel Cashman [Sat, 31 Mar 2018 01:54:14 +0000 (18:54 -0700)]
Add ROLLBACK past signing cert capability.
Add a new capability that may be granted to past signing certificates
after changing to a new signing certificate that will allow applications
to go back to a previous signing certificate. This capability is
intended to not be granted, but may be added later in the event that
a signing certificate change caused undesirable behavior.
Bug:
73927694
Test: PkgInstallSignatureVerificationTest
Change-Id: I7453a2da00e740a55de45e7b144f308a9bc33772
(cherry picked from commit
a1d0cf74f93bc6cdef054e73c9f09f44cc44d501)
Android Build Merger (Role) [Mon, 2 Apr 2018 20:10:17 +0000 (20:10 +0000)]
Merge "Merge "TextClassifier API updates." into pi-dev am:
bf9dfb16be" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 20:05:00 +0000 (20:05 +0000)]
[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am:
9bbfe5c14c
am:
cc1bf181d0 -s ours
Change-Id: Ica090f421ddbf4672f68bdbf77839a8e931638cf
Abodunrinwa Toki [Mon, 2 Apr 2018 20:03:04 +0000 (20:03 +0000)]
Merge "TextClassifier API updates." into pi-dev
am:
bf9dfb16be
Change-Id: I11d37c920abb4aa1fbd5022f30a10fdbe8efe997
TreeHugger Robot [Mon, 2 Apr 2018 20:00:46 +0000 (20:00 +0000)]
Merge "Updates MediaDrm developer docs" into pi-dev
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 19:54:57 +0000 (19:54 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
am:
9bbfe5c14c
Change-Id: Ida0d753a46f7aef9f0596d414edab8d36ea24b82
Bernie Innocenti [Mon, 2 Apr 2018 19:51:19 +0000 (19:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev
am:
4a3ccc18e6
Change-Id: I62c4c90283ab9a989db084e8d19582010f66bcee
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:43:54 +0000 (19:43 +0000)]
[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev
am:
6f5a8db2e9 -s ours
Change-Id: I4182b2dfad1f40dd29da8c3612cf0dbc4038aa7b
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev
am:
dfa8f0dbce
Change-Id: Ifb99a545b972b80ac5c0edf01e10b36e06ac06c5
Brian C. Young [Mon, 2 Apr 2018 19:40:58 +0000 (12:40 -0700)]
"Unlocked device required" javadoc clarification
Wording changes on the public API functions for these keys.
Test: CTS
Bug:
67752510
Change-Id: Iaf620e8c0e06d436d09f50d308268653bec196ce
Derek Sollenberger [Thu, 29 Mar 2018 18:18:44 +0000 (14:18 -0400)]
Print detailed memory usage of Skia for dumpsys gfxinfo
Bug:
74435803
Test: adb shell dumpsys gfxinfo [package_name]
Change-Id: I1f2bcab500fb47c5e0b50c7459d4a876b063916b
Bill Yi [Mon, 2 Apr 2018 19:36:17 +0000 (19:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e970444839 -s ours
Change-Id: Ia07b2d0ddf15dc1600bcf890ccb36e6cf26e8060
Bill Yi [Mon, 2 Apr 2018 19:35:42 +0000 (19:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae73c8bea6 -s ours
Change-Id: I2af4ff532f7f72de181464ff43ec6dbc355896aa