git.osdn.net Git - android-x86/frameworks-base.git/log

Gil O'Neil [Tue, 3 Apr 2018 06:33:45 +0000 (23:33 -0700)]

Merge "Made a note that app names may not contain delimiter characters" into pi-dev am: c610677258
am: b15319dcb5

Change-Id: Idc759f4d8e921784715719f8bc68a45b6c2095a8

commit | commitdiff | tree

Fyodor Kupolov [Tue, 3 Apr 2018 06:29:11 +0000 (23:29 -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
am: e5b4a8d9cc -s ours

Change-Id: Id3a29c32331d9cd75585f11d8757d98297681725

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 3 Apr 2018 06:20:37 +0000 (23:20 -0700)]

[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev am: cccd67b574 -s ours
am: 0e2563284c -s ours

Change-Id: I365d8b49ce7dbf99eeba99916452808ca102fa88

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 3 Apr 2018 06:00:43 +0000 (23:00 -0700)]

Merge "Camera: fix errorFlag logic" into pi-dev am: 4ccefebb78
am: fbb5c56f81

Change-Id: Id6b26fb903b31db38e0ec51d4fe2eeeefd9268c3

commit | commitdiff | tree

Jovana Knezevic [Tue, 3 Apr 2018 05:54:51 +0000 (22:54 -0700)]

Merge "Adding user accessor functions to UserManagerHelper." into pi-dev am: c3724b5e91
am: 6d277663a7

Change-Id: I73d66562c071c483e3f63c290ef2b4bb09739691

commit | commitdiff | tree

Mihai Popa [Tue, 3 Apr 2018 05:45:57 +0000 (22:45 -0700)]

Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev am: 285797a45a
am: da02fac9fe

Change-Id: I8ae04d1f8b6bebc8b1a1a2c01fe9d327b54839ae

commit | commitdiff | tree

Derek Sollenberger [Tue, 3 Apr 2018 05:37:31 +0000 (22:37 -0700)]

Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev am: 8ec341627c
am: b0765db5b8

Change-Id: I7d534a8c8a58aa314f8beb719b5ff7e99a42815e

commit | commitdiff | tree

Lorenzo Colitti [Tue, 3 Apr 2018 05:20:43 +0000 (22:20 -0700)]

Merge "Allow applications to query for foreground/background data usage." into pi-dev am: 3cafea0701
am: a232ae53bc

Change-Id: I324e6d67db28e6076f1d422bb15d0b5190a9a6c3

commit | commitdiff | tree

Rob Carr [Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)]

Merge changes Ia9df12fa,Ib114e8cb into pi-dev am: d8bfc71c6c
am: 653c02e438

Change-Id: I0ac0cd0c1be05381854b795532770a99fe5d2b2c

commit | commitdiff | tree

Daniel Cashman [Tue, 3 Apr 2018 05:00:29 +0000 (22:00 -0700)]

Merge "Add ROLLBACK past signing cert capability." into pi-dev am: 0594af6dc3
am: 65a5d78899

Change-Id: I9c10d82c026008fbd95b313b52e1423c779b5203

commit | commitdiff | tree

Jeff Sharkey [Tue, 3 Apr 2018 04:36:06 +0000 (21:36 -0700)]

Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
am: ec5fab7006

Change-Id: I0c460b27edeb8d0db734d1c8092e7eb866e656cd

commit | commitdiff | tree

Jeff Sharkey [Tue, 3 Apr 2018 04:21:22 +0000 (21:21 -0700)]

Obtain NPMS through helper method. am: a435ab5124
am: bfbae60fd4

Change-Id: I4278f93601da7f6ae580ae562b5ff8e86baf6abe

commit | commitdiff | tree

Hall Liu [Tue, 3 Apr 2018 04:06:14 +0000 (21:06 -0700)]

Merge "Change signature of requestBluetoothAudio" am: 545e20389d am: 442575f4f1
am: 2a74e5798d

Change-Id: Ia7fdee058a22521ec3e93ebb461d0197285bda5e

commit | commitdiff | tree

Brian C. Young [Tue, 3 Apr 2018 03:53:03 +0000 (20:53 -0700)]

Merge ""Unlocked device required" javadoc clarification" into pi-dev am: 084f9aee9a
am: 5ef26ddf60

Change-Id: I4754a4a2ff11480af778e72f927e6c3afd37f575

commit | commitdiff | tree

Todd Kennedy [Tue, 3 Apr 2018 03:45:38 +0000 (20:45 -0700)]

Merge "Exit the loop at the right time" into pi-dev am: 6d24a1c8be
am: b9af84ca8d

Change-Id: Ib9b12c8e7f2f832e28f19302278ed2685918a51e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 3 Apr 2018 02:51:37 +0000 (02:51 +0000)]

Merge "Merge "Work on issue #74404949: Screen state usage API" into pi-dev am: 886fc6aef0 am: b45bc522f6"

commit | commitdiff | tree

Dianne Hackborn [Tue, 3 Apr 2018 02:50:56 +0000 (19:50 -0700)]

Merge "Work on issue #74404949: Screen state usage API" into pi-dev am: 886fc6aef0
am: b45bc522f6

Change-Id: If566b8baf8367f31d0f8dc1107c547cc9ee11913

commit | commitdiff | tree

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

commit | commitdiff | tree

Doris Liu [Tue, 3 Apr 2018 02:46:43 +0000 (02:46 +0000)]

Merge "Remove unnecessary value setting in AnimatorSet seeking"

commit | commitdiff | tree

Lucas Dupin [Tue, 3 Apr 2018 02:44:54 +0000 (19:44 -0700)]

Merge "Remove old alarm IPC" into pi-dev am: ae6b800562
am: 9f4e4072e5

Change-Id: I565a3592ce9090de89d8afdb16abe9106c23371d

commit | commitdiff | tree

Shawn Willden [Tue, 3 Apr 2018 02:40:18 +0000 (19:40 -0700)]

Merge "Rename trustedUserPresenceRequired." into pi-dev am: 840c29eb0b
am: 7d64fc4141

Change-Id: If6d9e3674fa75f4383a4d2ddc12612ed2f8e452b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bryce Lee [Tue, 3 Apr 2018 01:58:11 +0000 (18:58 -0700)]

Merge "Do not set activity's task before clearing in some scenarios." into pi-dev am: 540f747861
am: e88e558484

Change-Id: I8c81d2cbbecba64829096457303f361d4aa54698

commit | commitdiff | tree

Jeff Sharkey [Tue, 3 Apr 2018 01:52:26 +0000 (18:52 -0700)]

Obtain NPMS through helper method.
am: a435ab5124

Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc

commit | commitdiff | tree

Jeff Tinker [Tue, 3 Apr 2018 01:52:23 +0000 (18:52 -0700)]

Merge "Updates MediaDrm developer docs" into pi-dev am: 1c967fe075
am: d2dc31b5b8

Change-Id: I94356f44fe3e9b1e381662ae702eb078ff8c4897

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]

Merge "Change signature of requestBluetoothAudio"
am: 545e20389d

Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Tue, 3 Apr 2018 01:22:37 +0000 (18:22 -0700)]

Merge "Don't use a copy of window params when showing a dialog." into pi-dev am: 3f6b7714a7
am: 558e9116fb

Change-Id: I2c5822125c734fbf5d11465fb5b59368094d3f76

commit | commitdiff | tree

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

commit | commitdiff | tree

Frank Salim [Tue, 3 Apr 2018 01:13:00 +0000 (18:13 -0700)]

Merge "Revise secure key import API after review" into pi-dev am: 50228a6471
am: 1a2743029a

Change-Id: I9acd33f63a49b0af86a98f98e3eed564f779502f

commit | commitdiff | tree

Yi Jin [Tue, 3 Apr 2018 01:09:44 +0000 (18:09 -0700)]

Remove some letters of verbose log am: ea31cbea93
am: 8700c43483

Change-Id: Iae50eac61ab255113218e3e5503e9f74a40623ff

commit | commitdiff | tree

Yi Jin [Tue, 3 Apr 2018 01:07:02 +0000 (18:07 -0700)]

Merge "Use modern c++ code style for incidentd." into pi-dev am: 56051569ab
am: 85d3cc02a1

Change-Id: Ia85dd17da1e0aefbb3bdece55c96f4e6b6686119

commit | commitdiff | tree

Andrii Kulian [Tue, 3 Apr 2018 01:03:36 +0000 (18:03 -0700)]

Merge "Don't finish activity on duplicate resume request" into pi-dev am: 38af02e75b
am: 4f632a306f

Change-Id: I016967a65cbbce525088d3c008d5bb311dc69d83

commit | commitdiff | tree

Sudheer Shanka [Tue, 3 Apr 2018 01:00:12 +0000 (18:00 -0700)]

Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev am: 8303baf4d0
am: 99b208a705

Change-Id: Iff6aacfe864d7a7548ab461ae704fafe2ba92fde

commit | commitdiff | tree

Doris Liu [Mon, 2 Apr 2018 23:37:17 +0000 (16:37 -0700)]

Remove unnecessary value setting in AnimatorSet seeking

Also fixed seeking in paused state

BUG:68274315
BUG: 68382377
Test: ag/3835109
Change-Id: Ifa6b717a77a34f2152bd0e7ad285556986dd47ff

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Shawn Willden [Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)]

Merge "Rename trustedUserPresenceRequired." into pi-dev
am: 840c29eb0b

Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Tue, 3 Apr 2018 00:14:58 +0000 (00:14 +0000)]

Merge "Change signature of requestBluetoothAudio"

commit | commitdiff | tree

Todd Kennedy [Tue, 3 Apr 2018 00:04:14 +0000 (00:04 +0000)]

Merge "Use per user info for seinfo" into pi-dev am: ce5f2b3e87
am: 82cac7ce69

Change-Id: Ic9420e057d739c56fa34381682239bd07be0f49c

commit | commitdiff | tree

Mike Digman [Mon, 2 Apr 2018 23:58:18 +0000 (23:58 +0000)]

Merge "Fix right-most navbar icon tinting mismatch" into pi-dev am: 78e805684b
am: 5bbbbfd57c

Change-Id: I931a77d77780c7da0d3e01d0cc99312348943961

commit | commitdiff | tree

Pavel Maltsev [Mon, 2 Apr 2018 23:53:36 +0000 (23:53 +0000)]

Merge "Make addUnwantedCapability method public" into pi-dev am: 7f5670fdcd
am: 32a5f10b96

Change-Id: I2dc8ce54b94b33fc207546604b381089604243d1

commit | commitdiff | tree

Erik Kline [Mon, 2 Apr 2018 23:48:48 +0000 (23:48 +0000)]

Merge "Refactor isTetheringSupported() calls" am: e34c426fd3 am: 6f63d051d6
am: 019cb1d42c

Change-Id: Ifa121b057f9959ddb980edc940327929e48ea973

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Derek Sollenberger [Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)]

Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am: ffe1c2a266" into pi-dev-plus-aosp
am: c13bf77769

Change-Id: I1d93eb9fadc99f578e7162a6aae82d6eb612a3b8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Yi Jin [Mon, 2 Apr 2018 23:07:30 +0000 (23:07 +0000)]

Remove some letters of verbose log
am: ea31cbea93

Change-Id: Ia1237171d4bcb5c5c86851883f58bbdd1cc7ac22

commit | commitdiff | tree

Remi NGUYEN VAN [Mon, 2 Apr 2018 23:06:53 +0000 (23:06 +0000)]

Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am: 07daad2dbf" into pi-dev-plus-aosp
am: 83b2d00f8d

Change-Id: I73dc0a154199b9856bf0d1d9dcc7e3c104fe6591

commit | commitdiff | tree

TreeHugger Robot [Mon, 2 Apr 2018 23:04:42 +0000 (23:04 +0000)]

Merge "Camera: fix errorFlag logic" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jovana Knezevic [Mon, 2 Apr 2018 22:59:24 +0000 (22:59 +0000)]

Merge "Adding user accessor functions to UserManagerHelper." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chalard Jean [Mon, 2 Apr 2018 22:51:45 +0000 (22:51 +0000)]

Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am: 6e66280d35" into pi-dev-plus-aosp
am: 35bca7f53b

Change-Id: I349260cae5d0d97f2f0962f62510703c5a94995c

commit | commitdiff | tree

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

commit | commitdiff | tree

Mihai Popa [Mon, 2 Apr 2018 22:42:17 +0000 (22:42 +0000)]

Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)]

Merge "Merge "TextClassifier API updates." into pi-dev am: bf9dfb16be" into pi-dev-plus-aosp
am: 008a5d01af

Change-Id: I4efb43ab74ac98244c6f4145855a75480e2c85b0

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

TreeHugger Robot [Mon, 2 Apr 2018 22:07:29 +0000 (22:07 +0000)]

Merge "Add ROLLBACK past signing cert capability." into pi-dev

commit | commitdiff | tree

Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 22:05:56 +0000 (22:05 +0000)]

[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am: 9bbfe5c14c am: cc1bf181d0 -s ours
am: e7c9223c56 -s ours

Change-Id: Iab0221299840cd3331afe23572d861ff857bab82

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)]

Merge ""Unlocked device required" javadoc clarification" into pi-dev

commit | commitdiff | tree

Bernie Innocenti [Mon, 2 Apr 2018 21:40:21 +0000 (21:40 +0000)]

Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev am: 4a3ccc18e6
am: 37709fb20f

Change-Id: I1c2147fcec739994af65037c16428e0d82367b18

commit | commitdiff | tree

Remi NGUYEN VAN [Mon, 2 Apr 2018 21:34:54 +0000 (21:34 +0000)]

[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev am: 6f5a8db2e9 -s ours
am: 1a874296bb -s ours

Change-Id: I4e31562aff3f78c4c79f58f6970741e90ded4880

commit | commitdiff | tree

Remi NGUYEN VAN [Mon, 2 Apr 2018 21:30:40 +0000 (21:30 +0000)]

Merge "Differentiate depleted and unset multipath quota" into pi-dev am: dfa8f0dbce
am: 633d48d5a5

Change-Id: Icc710ee97c02e7f40eb2ed8c64cd314db3b978f1

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e970444839 -s ours
am: 326344d20c -s ours

Change-Id: Iee048c4f7737bde065c2d42ef540e904bb614cb4

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:26:18 +0000 (21:26 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ae73c8bea6 -s ours
am: 316ecebd70 -s ours

Change-Id: I11aa3efcabcafb98a3142454bdb33a669bef25a1

commit | commitdiff | tree

Seigo Nonaka [Mon, 2 Apr 2018 21:21:59 +0000 (21:21 +0000)]

Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev am: 138148425c
am: f0a302f119

Change-Id: I30e9dfd37853001f77f655b74445d2861f05e12b

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:16:11 +0000 (21:16 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 299491afe1 -s ours
am: 469a4ce1d2 -s ours

Change-Id: Idbe486c3bd6a2b60299b8a988124b73fd3d5dd6a

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:15:45 +0000 (21:15 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: aaa2849890 -s ours
am: 2a3fcd8c9f -s ours

Change-Id: I2a14c3144042b5a90febd68b95c5c97e3dfde0e4

commit | commitdiff | tree

Bo Zhu [Mon, 2 Apr 2018 21:15:18 +0000 (21:15 +0000)]

Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev am: 3cd574ced9
am: 4c7cc36000

Change-Id: I2ea971fcc97f88679ba8436b0e2bf4a2de08a856

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:11:08 +0000 (21:11 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 85e4a97789 -s ours
am: 73af74db6c -s ours

Change-Id: I44a8c5f57d3d00311441c3fff7bdeba5d9e04fcb

commit | commitdiff | tree

Bill Yi [Mon, 2 Apr 2018 21:10:33 +0000 (21:10 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 879127f31d -s ours
am: edc08f4382 -s ours

Change-Id: Ibb74eb19844dfe8bc0348ee095202a2703cc3e28

commit | commitdiff | tree

Erik Kline [Mon, 2 Apr 2018 21:08:52 +0000 (21:08 +0000)]

Merge "Refactor isTetheringSupported() calls" am: e34c426fd3
am: 6f63d051d6

Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d

commit | commitdiff | tree

TreeHugger Robot [Mon, 2 Apr 2018 21:07:37 +0000 (21:07 +0000)]

Merge "Exit the loop at the right time" into pi-dev

commit | commitdiff | tree

Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]

Merge "Refactor isTetheringSupported() calls"
am: e34c426fd3

Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822

commit | commitdiff | tree

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