OSDN Git Service
Siyamed Sinir [Tue, 20 Mar 2018 02:23:42 +0000 (02:23 +0000)]
Merge "Fix rounding error related to autoSize" into pi-dev
am:
46c84bf237
Change-Id: I0c8b7c4b21d0980547025ebd58189a637020b209
Kweku Adams [Tue, 20 Mar 2018 02:20:03 +0000 (02:20 +0000)]
Merge "Removing the settings-based IncidentReportArgs method." into pi-dev
am:
46c0e91b74
Change-Id: I19be9d6a6c3b1674dada4eaaf36faf2e555a8b79
Leon Scroggins III [Tue, 20 Mar 2018 02:07:52 +0000 (02:07 +0000)]
Merge "Work around incorrect Skia gamma" into pi-dev
am:
c45c2d65a5
Change-Id: Id3e644dfa906600d664454cc96af242cf7bf2ff0
Shuzhen Wang [Tue, 20 Mar 2018 01:04:20 +0000 (01:04 +0000)]
Merge "Camera2: Use Set for physical camera IDs" into pi-dev
am:
83c4690f55
Change-Id: I11c86616264823d52e71e15db350ba6b588099b5
Philip P. Moltmann [Tue, 20 Mar 2018 00:56:47 +0000 (00:56 +0000)]
Merge "Add '?' to permission group requests." into pi-dev
am:
2594933301
Change-Id: I0fed1dfec9caa4a80c4a38a4d9928b9d0f68c2c3
Michael Wright [Tue, 20 Mar 2018 00:52:14 +0000 (00:52 +0000)]
Merge "Fix up brightness docs." into pi-dev
am:
27fd8bd327
Change-Id: I22674ebc957b054d2285072f05849cc32d70d5ae
Robert Berry [Tue, 20 Mar 2018 00:49:13 +0000 (00:49 +0000)]
Merge "Move trusted CA certs to core" into pi-dev
am:
f679bda843
Change-Id: I280586e435a15974dd1658e3e155fe959ccb373e
Jian Jin [Tue, 20 Mar 2018 00:44:47 +0000 (00:44 +0000)]
Merge "Added strings used by car keyguard overlay" into pi-dev
am:
c1e05c4af5
Change-Id: I20e1e5e41552fd51982eea8232d3b61f3a086bab
Andreas Gampe [Tue, 20 Mar 2018 00:27:23 +0000 (00:27 +0000)]
Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev
am:
0f8f3f25cf
Change-Id: Ib537886c003f4f4877a1fb4a89ad9ca25f603aea
Android Build Merger (Role) [Tue, 20 Mar 2018 00:09:43 +0000 (00:09 +0000)]
Merge "Merge "Added implementation for VTI add/remove address" am:
2543fbd8a2 am:
9dda91f806" into pi-dev-plus-aosp
Benedict Wong [Tue, 20 Mar 2018 00:09:15 +0000 (00:09 +0000)]
Merge "Added implementation for VTI add/remove address" am:
2543fbd8a2
am:
9dda91f806
Change-Id: Idaab45998f4765655bde6cf0274f2ba3c1b3ecf1
Android Build Merger (Role) [Tue, 20 Mar 2018 00:07:50 +0000 (00:07 +0000)]
Merge "Merge "Add setupwizard personalisation state to Settings" into pi-dev am:
e9b60f2cd3" into pi-dev-plus-aosp
Ajay Nadathur [Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)]
Merge "Add setupwizard personalisation state to Settings" into pi-dev
am:
e9b60f2cd3
Change-Id: Idd6fbd7415316ffe8e6641ec2becb99c6d48329d
Android Build Merger (Role) [Tue, 20 Mar 2018 00:00:55 +0000 (00:00 +0000)]
Merge "Merge "Allow system apps to make channels that bypass DND" into pi-dev am:
a4a76af324" into pi-dev-plus-aosp
Julia Reynolds [Tue, 20 Mar 2018 00:00:25 +0000 (00:00 +0000)]
Merge "Allow system apps to make channels that bypass DND" into pi-dev
am:
a4a76af324
Change-Id: I13f1ec2867d1fac51c76baa21d43ccaa30197f68
Android Build Merger (Role) [Mon, 19 Mar 2018 23:57:16 +0000 (23:57 +0000)]
Merge "Merge "Move roaming icon to upper left." into pi-dev am:
12a9f78dd8" into pi-dev-plus-aosp
Amin Shaikh [Mon, 19 Mar 2018 23:56:36 +0000 (23:56 +0000)]
Merge "Move roaming icon to upper left." into pi-dev
am:
12a9f78dd8
Change-Id: I46201ac40d7934733b06cd6008883354ebfefded
Android Build Merger (Role) [Mon, 19 Mar 2018 23:52:37 +0000 (23:52 +0000)]
Merge "Merge "Remove IMS Emergency Calling availability API" into pi-dev am:
4f59dce0f8 -s ours" into pi-dev-plus-aosp
Brad Ebinger [Mon, 19 Mar 2018 23:52:09 +0000 (23:52 +0000)]
Merge "Remove IMS Emergency Calling availability API" into pi-dev
am:
4f59dce0f8 -s ours
Change-Id: I43c5aad80d3da81bcdfa2cfb35e2015d066d576c
Jeff Davidson [Mon, 19 Mar 2018 23:49:38 +0000 (23:49 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." am:
fe78972bb2
am:
5d92d69be9 -s ours
Change-Id: Ib44b69e74974e3e68a5068bc5198bded7e0485be
Benedict Wong [Mon, 19 Mar 2018 23:45:10 +0000 (23:45 +0000)]
Merge "Added implementation for VTI add/remove address"
am:
2543fbd8a2
Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
Brad Ebinger [Mon, 19 Mar 2018 23:30:38 +0000 (23:30 +0000)]
Remove IMS Emergency Calling availability API
am:
d4854f11b7 -s ours
Change-Id: Ied7409226a5aa31d59fac3d2112b667ebffd8e8e
Selim Cinek [Mon, 19 Mar 2018 23:24:38 +0000 (23:24 +0000)]
Merge "Dispatching display list recreations also to transient views" into pi-dev
am:
036a2409fc
Change-Id: I2efbf117542eda421fa5e263b8b8a410b2b29a65
Adam Powell [Mon, 19 Mar 2018 23:21:29 +0000 (23:21 +0000)]
Merge "Add factory methods for async Handlers" into pi-dev
am:
fa38f238b1
Change-Id: I0dee61e5dbd2a21bbd03c06cde72a66a708bc55f
David Chen [Mon, 19 Mar 2018 23:16:51 +0000 (23:16 +0000)]
Merge "Small fixes to StatsManager API." into pi-dev
am:
96e680cb90
Change-Id: I2d7e2a204c91ed7a824002111452286e5efa4977
Todd Kennedy [Mon, 19 Mar 2018 23:13:42 +0000 (23:13 +0000)]
Merge "Set application info flags prior to scanning" into pi-dev
am:
0c46d7b57f
Change-Id: Ib549564d4c415b4883b78c9f3ec581ae445f7975
sqian [Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)]
Merge "TelephonyManager System APIs process" into pi-dev
am:
f0aeb0578e
Change-Id: If80a92c24d11ab0b48dfdda32a9521f1f7ec4993
Android Build Merger (Role) [Mon, 19 Mar 2018 22:55:22 +0000 (22:55 +0000)]
Merge "Merge "Atoms: Mobile Connection" into pi-dev am:
dba47fcd09" into pi-dev-plus-aosp
Tej Singh [Mon, 19 Mar 2018 22:54:01 +0000 (22:54 +0000)]
Merge "Atoms: Mobile Connection" into pi-dev
am:
dba47fcd09
Change-Id: I3008bae7f5ecebbbb79fbe141479d25c6c5f5867
Android Build Merger (Role) [Mon, 19 Mar 2018 22:46:42 +0000 (22:46 +0000)]
Merge "Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev am:
89b182890c" into pi-dev-plus-aosp
Robert Carr [Mon, 19 Mar 2018 22:46:11 +0000 (22:46 +0000)]
Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev
am:
89b182890c
Change-Id: I2ad5181dab33597fc9a917bf8cdd0d83e6f0466a
Android Build Merger (Role) [Mon, 19 Mar 2018 22:45:56 +0000 (22:45 +0000)]
Merge "Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" am:
78a7b5d44a am:
4e1563e512" into pi-dev-plus-aosp
Brad Ebinger [Mon, 19 Mar 2018 22:45:28 +0000 (22:45 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" am:
78a7b5d44a
am:
4e1563e512
Change-Id: Ic8e24c73cbb9a22236bb153ba290338184504cc3
Yi Jin [Mon, 19 Mar 2018 22:41:37 +0000 (22:41 +0000)]
Merge "Fix the test failure of LogSection, don't consider read log msg error as a failure since it is used to signal EOF." into pi-dev
am:
ea9c59b469
Change-Id: I5a3b2ddeb50e9a9b96afffc9ff6b3bb04bc8d29f
Jeff Davidson [Mon, 19 Mar 2018 22:39:02 +0000 (22:39 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners."
am:
fe78972bb2
Change-Id: I689aa7570113ace6f0a89acfaaea3844efff8cad
Tracy Zhou [Mon, 19 Mar 2018 22:37:06 +0000 (22:37 +0000)]
Merge "Move default pip position to right above the shelf." into pi-dev
am:
017f44be88
Change-Id: I0b61860bedd0b949dbd2b2f87b10149c3577559b
Felipe Leme [Mon, 19 Mar 2018 22:33:14 +0000 (22:33 +0000)]
Merge "Fixed isVisibleToUserForAutofill() again." into pi-dev
am:
e24c95fac5
Change-Id: I1e1bf92156608ca8c4296145a5ccd9775888dd78
Brad Ebinger [Mon, 19 Mar 2018 22:33:01 +0000 (22:33 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
am:
78a7b5d44a
Change-Id: If11be7e1ee331ca17ab4a18270faa47c0b7798a6
Kevin Chyn [Mon, 19 Mar 2018 22:28:38 +0000 (22:28 +0000)]
Merge "Listen to task stack only when AuthenticationClient is running" into pi-dev
am:
7699d2d7e4
Change-Id: I0a00eef9c11a2b089b57607de6ab89686700a04e
Siyamed Sinir [Mon, 19 Mar 2018 22:15:31 +0000 (22:15 +0000)]
Merge "Fix rounding error related to autoSize" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 22:15:11 +0000 (22:15 +0000)]
Merge "Removing the settings-based IncidentReportArgs method." into pi-dev
Aaron Whyte [Mon, 19 Mar 2018 22:11:18 +0000 (22:11 +0000)]
Merge "Revert "Break down jank between frame drops vs. triple buffered"" into pi-dev
am:
fbb4b82156
Change-Id: I42aa2bf9919eec9dcfe3a1b4a0fef162982fdeff
TreeHugger Robot [Mon, 19 Mar 2018 22:10:31 +0000 (22:10 +0000)]
Merge "Work around incorrect Skia gamma" into pi-dev
Benedict Wong [Mon, 19 Mar 2018 22:05:09 +0000 (22:05 +0000)]
Merge "Added implementation for VTI add/remove address"
TreeHugger Robot [Mon, 19 Mar 2018 22:02:58 +0000 (22:02 +0000)]
Merge "Camera2: Use Set for physical camera IDs" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:59:15 +0000 (21:59 +0000)]
Merge "Add '?' to permission group requests." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:47:22 +0000 (21:47 +0000)]
Merge "Fix up brightness docs." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:44:23 +0000 (21:44 +0000)]
Merge "Move trusted CA certs to core" into pi-dev
Android Build Merger (Role) [Mon, 19 Mar 2018 21:41:19 +0000 (21:41 +0000)]
Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am:
d65f5ed038" into pi-dev-plus-aosp
Jian Jin [Mon, 19 Mar 2018 21:40:41 +0000 (21:40 +0000)]
Merge "Added strings used by car keyguard overlay" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:40:37 +0000 (21:40 +0000)]
Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev
Leon Scroggins [Mon, 19 Mar 2018 21:39:49 +0000 (21:39 +0000)]
Merge "Add ImageDecoder.Source for resources" into pi-dev
am:
d65f5ed038
Change-Id: I4b69423bb54ca34161a7b4f98d1c87c427139660
Andreas Gampe [Mon, 19 Mar 2018 21:38:59 +0000 (21:38 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks" am:
af3dc4fc70
am:
bccdf32c8a
Change-Id: Ie640cf1734ff80a19d8c0ba65734f5e76d26fa76
Julia Reynolds [Mon, 19 Mar 2018 21:32:50 +0000 (21:32 +0000)]
Merge "Update system notification text" into pi-dev
am:
a90868c525
Change-Id: If76acb25af7f3dd7ecd1b0ec5364c7123ff9e051
Julia Reynolds [Mon, 19 Mar 2018 21:29:05 +0000 (21:29 +0000)]
Merge "Remove unneeded sysui notifications" into pi-dev
am:
bd65574db6
Change-Id: I48a017b4397292bfa4009af72a7200932f930e62
TreeHugger Robot [Mon, 19 Mar 2018 21:26:37 +0000 (21:26 +0000)]
Merge "Add setupwizard personalisation state to Settings" into pi-dev
Makoto Onuki [Mon, 19 Mar 2018 21:24:48 +0000 (21:24 +0000)]
Merge "Disabler AppStateTracker debug log" into pi-dev
am:
62fb8fbeac
Change-Id: Ibe2fd1780e63a6556fa9287caca6db47a3cebcb6
Treehugger Robot [Mon, 19 Mar 2018 21:24:27 +0000 (21:24 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners."
Andreas Gampe [Mon, 19 Mar 2018 21:24:24 +0000 (21:24 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
am:
af3dc4fc70
Change-Id: Ib7b56bb493be1053d2277a68a1d64010eb7d6033
TreeHugger Robot [Mon, 19 Mar 2018 21:23:58 +0000 (21:23 +0000)]
Merge "Allow system apps to make channels that bypass DND" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:15:52 +0000 (21:15 +0000)]
Merge "Move roaming icon to upper left." into pi-dev
Brad Ebinger [Mon, 19 Mar 2018 21:12:43 +0000 (21:12 +0000)]
Merge "Remove IMS Emergency Calling availability API" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:09:31 +0000 (21:09 +0000)]
Merge "Dispatching display list recreations also to transient views" into pi-dev
Adam Powell [Mon, 19 Mar 2018 21:09:01 +0000 (21:09 +0000)]
Merge "Add factory methods for async Handlers" into pi-dev
Treehugger Robot [Mon, 19 Mar 2018 21:04:56 +0000 (21:04 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
TreeHugger Robot [Mon, 19 Mar 2018 21:04:39 +0000 (21:04 +0000)]
Merge "Small fixes to StatsManager API." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 21:01:30 +0000 (21:01 +0000)]
Merge "Set application info flags prior to scanning" into pi-dev
Seigo Nonaka [Mon, 19 Mar 2018 20:57:27 +0000 (20:57 +0000)]
Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev
am:
b3aec698e8
Change-Id: I53dfdbfbd7d9a1278ae1e82e98f21cbddbc0cf55
TreeHugger Robot [Mon, 19 Mar 2018 20:55:18 +0000 (20:55 +0000)]
Merge "TelephonyManager System APIs process" into pi-dev
Adrian Roos [Mon, 19 Mar 2018 20:50:28 +0000 (20:50 +0000)]
Merge changes Ifc6355e2,Ia8afa338 into pi-dev
am:
ba9e18c2a8
Change-Id: Idc7c51b688da32f447b0f17873853923bf724278
Felipe Leme [Mon, 19 Mar 2018 20:46:58 +0000 (20:46 +0000)]
Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev
am:
a96583edf6
Change-Id: If54a4c871affdaaf91134760c7948925c419f342
TreeHugger Robot [Mon, 19 Mar 2018 20:45:55 +0000 (20:45 +0000)]
Merge "Atoms: Mobile Connection" into pi-dev
Alice Sheng [Mon, 19 Mar 2018 20:33:11 +0000 (20:33 +0000)]
Merge "Add setting for enabling CPU frequency scaling." into pi-dev
am:
1799f2b878
Change-Id: I297da1b2ed52e81bb632842b468237d2b0ed31a9
TreeHugger Robot [Mon, 19 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 20:29:59 +0000 (20:29 +0000)]
Merge "Fix the test failure of LogSection, don't consider read log msg error as a failure since it is used to signal EOF." into pi-dev
Android Build Merger (Role) [Mon, 19 Mar 2018 20:23:39 +0000 (20:23 +0000)]
Merge "Merge "Bluetooth: preserve one advertisement slot for GMS core" into pi-dev am:
fd7d9c5710" into pi-dev-plus-aosp
Qiyu Hu [Mon, 19 Mar 2018 20:22:56 +0000 (20:22 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core" into pi-dev
am:
fd7d9c5710
Change-Id: I3a4d8033c219dbb53d618e4588cf5ed39b9a4e0b
Android Build Merger (Role) [Mon, 19 Mar 2018 20:19:13 +0000 (20:19 +0000)]
Merge "Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev am:
a946d88011" into pi-dev-plus-aosp
Felipe Leme [Mon, 19 Mar 2018 20:18:36 +0000 (20:18 +0000)]
Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev
am:
a946d88011
Change-Id: Ie944c93a7586ff1de665d92590a57e541c4b7d1c
Android Build Merger (Role) [Mon, 19 Mar 2018 20:16:18 +0000 (20:16 +0000)]
Merge "Merge "Add the AVRCP Target Service (2/2)" am:
61265410e8 am:
a33ad4f2bd" into pi-dev-plus-aosp
Ajay Panicker [Mon, 19 Mar 2018 20:15:32 +0000 (20:15 +0000)]
Merge "Add the AVRCP Target Service (2/2)" am:
61265410e8
am:
a33ad4f2bd
Change-Id: I2f34d563e1bf8224a9388701d9d8718d7aec3a0a
Alex Kershaw [Mon, 19 Mar 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it's a no-op (and silent fail) when called from a non-system user." into pi-dev
am:
56be97edd0
Change-Id: I26c48173f62c19c437a6f24bd63159f80e3f6fb1
Tracy Zhou [Mon, 19 Mar 2018 20:15:14 +0000 (20:15 +0000)]
Merge "Move default pip position to right above the shelf." into pi-dev
Ajay Panicker [Mon, 19 Mar 2018 20:03:32 +0000 (20:03 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
am:
61265410e8
Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
TreeHugger Robot [Mon, 19 Mar 2018 19:57:14 +0000 (19:57 +0000)]
Merge "Fixed isVisibleToUserForAutofill() again." into pi-dev
David Chen [Mon, 19 Mar 2018 19:46:12 +0000 (19:46 +0000)]
Merge "Deletes default allowed_log_sources in statsd." into pi-dev
am:
f5de606f51
Change-Id: Id288fe64ea4027445b473185cee0b71bf0fde3bd
TreeHugger Robot [Mon, 19 Mar 2018 19:45:23 +0000 (19:45 +0000)]
Merge "Listen to task stack only when AuthenticationClient is running" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 19:44:14 +0000 (19:44 +0000)]
Merge "Revert "Break down jank between frame drops vs. triple buffered"" into pi-dev
Tyler Gunn [Mon, 19 Mar 2018 19:40:01 +0000 (19:40 +0000)]
Merge "Rename handover failure constant per API review comments." am:
7c8a877231
am:
ffe1c22271
Change-Id: Icae03afa86e7b660e9f52df252d2e3c961762be8
Treehugger Robot [Mon, 19 Mar 2018 19:38:13 +0000 (19:38 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
Jong Wook Kim [Mon, 19 Mar 2018 19:29:01 +0000 (19:29 +0000)]
Merge "Display that MAC is randomized in About Phones" into pi-dev
am:
a6268f8c9d
Change-Id: I6ca9515d6c1568e5b19609cef2870cdd74859845
Leon Scroggins [Mon, 19 Mar 2018 19:28:09 +0000 (19:28 +0000)]
Merge "Add ImageDecoder.Source for resources" into pi-dev
Adrian Roos [Mon, 19 Mar 2018 19:22:25 +0000 (19:22 +0000)]
Merge "Fix PackageParser tests" into pi-dev
am:
65a84cafaf
Change-Id: Ieeb1e9359ffb766aa83686711f88b95e29be06e6
Mike Ma [Mon, 19 Mar 2018 19:19:25 +0000 (19:19 +0000)]
Merge "Resolve STATSD and batterystats race condition" into pi-dev
am:
1639c330fc
Change-Id: I7715069130c5e8d3d4b74cdc8da4306942931627
Julia Reynolds [Mon, 19 Mar 2018 19:18:47 +0000 (19:18 +0000)]
Merge "Update system notification text" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 19:16:55 +0000 (19:16 +0000)]
Merge "Remove unneeded sysui notifications" into pi-dev
John Reck [Mon, 19 Mar 2018 19:12:20 +0000 (19:12 +0000)]
Merge "Don't use IPC in isolateProcess" into pi-dev
am:
75cd1c0334
Change-Id: If943e25ce31246bbc4267402b679665f674980ef
TreeHugger Robot [Mon, 19 Mar 2018 19:10:16 +0000 (19:10 +0000)]
Merge "Disabler AppStateTracker debug log" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 19:02:34 +0000 (19:02 +0000)]
Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev
Chavi Weingarten [Mon, 19 Mar 2018 19:01:53 +0000 (19:01 +0000)]
Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev
am:
22ab2b9636
Change-Id: I90a1f1a43c46d8f12028f82df4a161b3392b851b
OSDN Git Service
