OSDN Git Service
Jorim Jaggi [Mon, 8 May 2017 12:58:05 +0000 (12:58 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev
am:
5286b96576
Change-Id: I9e84ae5c1729bd417d449d18eec0449c40029a2c
Jorim Jaggi [Mon, 8 May 2017 12:51:42 +0000 (12:51 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev
Rubin Xu [Mon, 8 May 2017 12:10:17 +0000 (12:10 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev
am:
a5f08d340d
Change-Id: I4d94dd962459c8a565eb2efc7d26afe80e14786b
TreeHugger Robot [Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev
am:
5a421ad0ef
Change-Id: Iad313a998a159049cfc55fff978b47be93f5e834
Jeff Sharkey [Sun, 7 May 2017 17:45:36 +0000 (17:45 +0000)]
Merge "No quota-level details for public volumes." into oc-dev
am:
4566cb5756
Change-Id: Ib778a428d4f43b976b13ab21aee021bb9beb7d79
Jeff Sharkey [Sun, 7 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:38:15 +0000 (17:38 +0000)]
Merge "No quota-level details for public volumes." into oc-dev
Svet Ganov [Sun, 7 May 2017 01:33:11 +0000 (01:33 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev
am:
6bfcc82a4b
Change-Id: I4bc2190dba1afc2274547a00984635cbbc3a4b6b
TreeHugger Robot [Sun, 7 May 2017 01:17:02 +0000 (01:17 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev
Dianne Hackborn [Sun, 7 May 2017 01:07:41 +0000 (01:07 +0000)]
Merge "Fix issue #
38037532: Toasts cause apps to become foreground" into oc-dev
am:
1801f688b9
Change-Id: Ib812e0357e50b5af010552d0ef18d27e071370b2
Dianne Hackborn [Sun, 7 May 2017 00:59:06 +0000 (00:59 +0000)]
Merge "Fix issue #
38037532: Toasts cause apps to become foreground" into oc-dev
Svet Ganov [Sat, 6 May 2017 23:12:16 +0000 (16:12 -0700)]
Only clear state for force stopped fill service
Test: manual
bug:
37785814
Change-Id: I5e40a284788bacf1ebae5ddefffb93b1a5b47d39
Svet Ganov [Sat, 6 May 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Add call super" into oc-dev
am:
a41a968f10
Change-Id: I864d2ec8d19e37ee1cd849d6cefb216df79ff6dd
TreeHugger Robot [Sat, 6 May 2017 22:46:37 +0000 (22:46 +0000)]
Merge "Add call super" into oc-dev
Svet Ganov [Sat, 6 May 2017 02:38:45 +0000 (19:38 -0700)]
Add call super
Test: manual
bug:
37775067
Change-Id: I50a50f1fbdb7e9c087c72ad0be3b767aeab9572a
Philip P. Moltmann [Sat, 6 May 2017 15:57:57 +0000 (15:57 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev
am:
0271dfd814
Change-Id: I3bde59a5bf68a9cf4cb328c39bdbf22292b0ed86
TreeHugger Robot [Sat, 6 May 2017 15:51:44 +0000 (15:51 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev
Phil Weaver [Sat, 6 May 2017 15:40:20 +0000 (15:40 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev
am:
2a86bad94c
Change-Id: I268464c67b76de2a5c467a8cbb60b4dbee784b47
Phil Weaver [Sat, 6 May 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 03:09:15 +0000 (03:09 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev
am:
8e3a8a7027
Change-Id: I724cabd147d86d34dc8b76cbbe083500e9b994f5
Colin Cross [Sat, 6 May 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82 am:
06a6e81c1d
am:
fb18f4cfed -s ours
Change-Id: I8b61ee0eedd7c0c9b217ab943200db330925bd0e
TreeHugger Robot [Sat, 6 May 2017 03:03:07 +0000 (03:03 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev
Android Build Merger (Role) [Sat, 6 May 2017 02:58:25 +0000 (02:58 +0000)]
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a am:
d38615b846 am:
63a79edbe0 -s ours" into oc-dev-plus-aosp
nharold [Sat, 6 May 2017 02:54:22 +0000 (02:54 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a am:
d38615b846
am:
63a79edbe0 -s ours
Change-Id: I601b62fd047d2b446de3d6c67c18bcc0a56316f9
Svetoslav Ganov [Sat, 6 May 2017 02:51:45 +0000 (02:51 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
am:
71c999febb
Change-Id: I91b9e3bea2335b01c6f0d52500a3b3775c62d163
Svetoslav Ganov [Sat, 6 May 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
Colin Cross [Sat, 6 May 2017 02:25:51 +0000 (02:25 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82
am:
06a6e81c1d
Change-Id: Ib613e9f89275c2af534c0b341f6c1c14c9af819a
Colin Cross [Sat, 6 May 2017 02:19:49 +0000 (02:19 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
am:
d308803b82
Change-Id: I90804cba65863d6194d7dd683024b43297357f19
Philip P. Moltmann [Sat, 6 May 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev
am:
d19113b390
Change-Id: I492245dee87450b1b54fef2c06c600ac290adffe
Jeff Sharkey [Sat, 6 May 2017 02:08:27 +0000 (02:08 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev
am:
6f4aab2c01
Change-Id: Id6045353ed2293ece7ecdb7697904fa7993a7ed3
TreeHugger Robot [Sat, 6 May 2017 02:07:54 +0000 (02:07 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev
nharold [Sat, 6 May 2017 02:06:27 +0000 (02:06 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a
am:
d38615b846
Change-Id: Ib24d0d0f98ca59684e64ea9a85dd230d17143cb8
Fyodor Kupolov [Sat, 6 May 2017 02:06:04 +0000 (02:06 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev
am:
748405a0f5
Change-Id: I2780805663b223d82b1b7d3582ae5850c30c7b7d
Fyodor Kupolov [Sat, 6 May 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev
am:
b4656dafc1
Change-Id: Ic350bed31bd9d92f377bbe88aa5d8142984ec5f9
Treehugger Robot [Sat, 6 May 2017 02:02:44 +0000 (02:02 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
Jeff Sharkey [Sat, 6 May 2017 01:58:07 +0000 (01:58 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev
Roozbeh Pournader [Sat, 6 May 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
am:
4972daf992
Change-Id: I8e24a7b278150bbb8b1e4b629f1d3473a732e7b9
nharold [Sat, 6 May 2017 01:55:40 +0000 (01:55 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
am:
abcc43d86a
Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
TreeHugger Robot [Sat, 6 May 2017 01:52:10 +0000 (01:52 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
* changes:
Move newFromRil() function to a utility class
Remove dependency on telephony-common from services/core
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
Port Utility Functions from DefaultPhoneNotifier
Remove dependency on IccConstants from SmsManager
Move files from frameworks/opt/telephony to frameworks/base
TreeHugger Robot [Sat, 6 May 2017 01:44:11 +0000 (01:44 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 01:25:27 +0000 (01:25 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
am:
288f085aba
Change-Id: I3b3ec60bcd86d647100f5c1cbc12836ab95e77ee
Steven Moreland [Sat, 6 May 2017 01:21:39 +0000 (01:21 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev
am:
19419d00fb
Change-Id: Ia88a9c94e32074484aa24b3d06353709c458115b
Jean-Michel Trivi [Sat, 6 May 2017 01:16:38 +0000 (01:16 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:15:38 +0000 (01:15 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev
Nathan Harold [Wed, 25 Jan 2017 01:08:34 +0000 (17:08 -0800)]
Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA
-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter
Bug:
33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
Nathan Harold [Wed, 14 Dec 2016 19:40:03 +0000 (11:40 -0800)]
Remove dependency on telephony-common from services/core
After migrating all the dependencies from frameworks/opt/telephony
to frameworks/base, the dependency is no longer needed and should
never have been created in the first place. Happily removed.
Bug:
33414487
Test: compilation
Change-Id: I261da4c6b819b3c960ce56d2cab5c80cb34e852e
Nathan Harold [Wed, 14 Dec 2016 19:24:48 +0000 (11:24 -0800)]
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry
Bug:
33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
Nathan Harold [Wed, 14 Dec 2016 18:48:00 +0000 (10:48 -0800)]
Port Utility Functions from DefaultPhoneNotifier
-Move static utility functions from frameworks/opt/telephony/
..DefaultPhoneNotifier to a new utility class in frameworks/base
-Update TelephonyRegistry to point to the new functions.
Bug:
33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
Nathan Harold [Wed, 14 Dec 2016 03:03:09 +0000 (19:03 -0800)]
Remove dependency on IccConstants from SmsManager
-Redefine the length of the SmsRecord in SmsManager
Bug:
33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
Nathan Harold [Wed, 26 Apr 2017 01:27:08 +0000 (18:27 -0700)]
Move files from frameworks/opt/telephony to frameworks/base
Bug:
37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Colin Cross [Thu, 20 Apr 2017 19:20:20 +0000 (12:20 -0700)]
Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit
3f8fd40f285dba5b3639ee1e3d4e4544048c1446)
Colin Cross [Thu, 20 Apr 2017 19:20:20 +0000 (12:20 -0700)]
Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit
3f8fd40f285dba5b3639ee1e3d4e4544048c1446)
Nathan Harold [Sat, 6 May 2017 00:48:58 +0000 (00:48 +0000)]
Merge "Move files from frameworks/opt/telephony to frameworks/base" into oc-dev-plus-aosp
Yifan Hong [Sat, 6 May 2017 00:42:05 +0000 (00:42 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764 am:
7fbbc2e85d
am:
31175a97b4 -s ours
Change-Id: I4dc312132d8c91e46de6fec7b944a8e42086577b
Yifan Hong [Sat, 6 May 2017 00:40:44 +0000 (00:40 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be am:
dd4156cb43
am:
c62e73c6a4 -s ours
Change-Id: Id96eb1c95e939fa91410a6f4b9c08fba41d593d7
Jean-Michel Trivi [Fri, 5 May 2017 18:43:31 +0000 (11:43 -0700)]
Audio service: always unduck focus requester when granted
When an app is requesting focus, it might
have been in the focus stack before, and ducked. Always
unduck the associated players when the app requests audio
focus and it is granted.
When an app gains focus from an another abandoning focus,
do not make unducking conditional to having a focus
dispatcher (== app has a focus listener).
Test: test app made to duck, re-request focus and verify not ducked
Bug:
37433811
Change-Id: I7e5b29c9148c923e7510957b971e28b6139d6156
Yifan Hong [Sat, 6 May 2017 00:28:09 +0000 (00:28 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764
am:
7fbbc2e85d
Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95
Yifan Hong [Sat, 6 May 2017 00:26:53 +0000 (00:26 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be
am:
dd4156cb43
Change-Id: I877107d04b96038592a8aaf2c79aecdd316318f2
Yifan Hong [Sat, 6 May 2017 00:18:51 +0000 (00:18 +0000)]
Merge changes from topic 'libvintf_cp'
am:
9bd4c20764
Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8
Yifan Hong [Sat, 6 May 2017 00:17:26 +0000 (00:17 +0000)]
Add compatibility matrices to VintfObject.report()
am:
4463d991be
Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge changes from topic 'libvintf_cp'
* changes:
android.os.VintfObject: add API for EDI.
Add compatibility matrices to VintfObject.report()
Fyodor Kupolov [Fri, 5 May 2017 00:27:16 +0000 (17:27 -0700)]
Call ActivityManager to request activity relaunch
Instead of relaunching activity in-process, ask ActivityManager.
requestActivityRelaunch to relaunch it. It can make the correct
decision when activity needs to be relaunched.
Test: manual - switch between users to trigger ActivityThread.handleApplicationInfoChanged
Bug:
37992833
Bug:
37412579
Change-Id: I662a04e3cd82115a6008cef9308a2cf1038d51e1
Ruben Brunk [Fri, 5 May 2017 23:52:14 +0000 (23:52 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c am:
0b34d001e4
am:
f4a9d362a8
Change-Id: I8827be128443902d7f614fdd275519723bd76dc0
Ruben Brunk [Fri, 5 May 2017 23:46:53 +0000 (23:46 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c
am:
0b34d001e4
Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323
Ruben Brunk [Fri, 5 May 2017 23:39:50 +0000 (23:39 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
am:
612b8bef0c
Change-Id: Ia71233576b7f8a712abf495164923a092cdc5677
Dianne Hackborn [Fri, 5 May 2017 06:27:23 +0000 (23:27 -0700)]
Fix issue #
38037532: Toasts cause apps to become foreground
ForegroundToken is now ImportanceToken, and doesn't actually
cause an app to become foreground (that is not needed for
toasts anyway).
Also improved output and logging -- new logs for changing
in key uid stats, and when force stopping services after a
uid goes idle.
Test: manual
Change-Id: I44dd391bb8d37857be1359f4b7021dc8d2cd0285
Treehugger Robot [Fri, 5 May 2017 23:28:39 +0000 (23:28 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
Colin Cross [Fri, 5 May 2017 23:12:53 +0000 (23:12 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa am:
d1d283692f
am:
5fa4ae0c33
Change-Id: Ia938c9e716d613bed3ed5b0903b4b937e2699987
Colin Cross [Fri, 5 May 2017 22:45:11 +0000 (22:45 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa
am:
d1d283692f
Change-Id: I40746901ee18123838c6e50e429c178585566e32
Colin Cross [Fri, 5 May 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Update path for libmediandk headers"
am:
9d9aab48fa
Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path for libmediandk headers"
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit
6bdc550e27e2c4e7b32bb91085eaac898d7d1156)
Philip P. Moltmann [Fri, 5 May 2017 20:30:38 +0000 (13:30 -0700)]
Prune abandoned autofill sessions
Regularly check if the sessions are still valid and clear the ones that
are not.
Test: 1. Started session in dialer
2. Home button (dialer goes in background)
3. kill -9 dialer
4. Wait 30 seconds
5. Start session is messenger
6. dialer session stays
1. Started session in dialer
2. Home button (dialer goes in background)
3. kill -9 dialer
4. Swipe dialer from recents
5. Wait 30 seconds
5. Start session is messenger
6. dialer session is removed
Fixes:
38005472
Change-Id: I8199ce44777b313141ee1eab6c8de5ad5089474a
Android Build Merger (Role) [Fri, 5 May 2017 22:06:45 +0000 (22:06 +0000)]
Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am:
718688f39b" into oc-dev-plus-aosp
Yifan Hong [Fri, 5 May 2017 22:05:08 +0000 (22:05 +0000)]
Merge "android.os.VintfObject: add API for EDI." into oc-dev
am:
718688f39b
Change-Id: I937b7972b40747e36b9fe3a2ff008c1052652962
Android Build Merger (Role) [Fri, 5 May 2017 22:03:33 +0000 (22:03 +0000)]
Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4" into oc-dev-plus-aosp
George Mount [Fri, 5 May 2017 22:02:37 +0000 (22:02 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
am:
c110c5edf4
Change-Id: Idfb0cc04edfbe2cb8ac96122ece8a0d1e00ab475
Android Build Merger (Role) [Fri, 5 May 2017 22:00:43 +0000 (22:00 +0000)]
Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad" into oc-dev-plus-aosp
Suprabh Shukla [Fri, 5 May 2017 21:59:49 +0000 (21:59 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
am:
7c95e968ad
Change-Id: I84049eea0c2aec1ed4e643bef0a4899890f80bf1
Svet Ganov [Fri, 5 May 2017 21:27:13 +0000 (14:27 -0700)]
Hide from the world that ssaid is in a dedicated table
Test: manual
bug:
37793918
Change-Id: I7c7405c7bd192d528f1f87095a03a2d21953dbc8
George Mount [Fri, 5 May 2017 21:53:54 +0000 (21:53 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
am:
c110c5edf4
Change-Id: Iab69422e0f47c2f7bf83664948dc6accee7da52f
TreeHugger Robot [Fri, 5 May 2017 21:47:43 +0000 (21:47 +0000)]
Merge "android.os.VintfObject: add API for EDI." into oc-dev
Suprabh Shukla [Fri, 5 May 2017 21:47:14 +0000 (21:47 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
am:
7c95e968ad
Change-Id: I51173313438190befa4ad1905ae90d828faab358
TreeHugger Robot [Fri, 5 May 2017 21:42:55 +0000 (21:42 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 21:42:54 +0000 (21:42 +0000)]
Merge "Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master am:
da0363104c am:
56014efbfd" into oc-dev-plus-aosp
Kenny Root [Fri, 5 May 2017 21:42:03 +0000 (21:42 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master am:
da0363104c
am:
56014efbfd
Change-Id: I4576ade698e72dd1c5731a4cff92f1c36cdb6f05
Android Build Merger (Role) [Fri, 5 May 2017 21:41:37 +0000 (21:41 +0000)]
Merge "Merge "Improved dump() on Autofill UI." into oc-dev am:
1f74edd2d7" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 5 May 2017 21:41:16 +0000 (21:41 +0000)]
Merge changes from topic 'am-
5af6dcdbe67049bb85b1929f4c3e828d' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6 am:
9172df0777
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f am:
4fd0b06ac7
Kenny Root [Fri, 5 May 2017 21:39:42 +0000 (21:39 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6
am:
9172df0777
Change-Id: I6af7c373f22dace57c9719361104493178e08bd5
Kenny Root [Fri, 5 May 2017 21:38:30 +0000 (21:38 +0000)]
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f
am:
4fd0b06ac7
Change-Id: Ie543058742d47ecfdf645134c7165686318f9526
Felipe Leme [Fri, 5 May 2017 21:37:34 +0000 (21:37 +0000)]
Merge "Improved dump() on Autofill UI." into oc-dev
am:
1f74edd2d7
Change-Id: Ic590ec7047a832f067391fa29d85e68d09a27c60
Jeff Sharkey [Fri, 5 May 2017 21:37:26 +0000 (15:37 -0600)]
No quota-level details for public volumes.
Fall back to whatever statvfs() tells us.
Test: builds, boots
Bug:
37573475
Change-Id: I713564292d41797e80860d6aa739266d9799af7f
Kenny Root [Fri, 5 May 2017 21:33:39 +0000 (21:33 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6
am:
9172df0777
Change-Id: I78b96e5ae3231185a1b26e2e8b9f95881c279de0
Kenny Root [Fri, 5 May 2017 21:32:28 +0000 (21:32 +0000)]
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f
am:
4fd0b06ac7
Change-Id: I39c4532965db9a154657e7f90ff6a5b1ebb84a35
Suprabh Shukla [Fri, 5 May 2017 21:32:12 +0000 (21:32 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Improved dump() on Autofill UI." into oc-dev
Jeff Sharkey [Fri, 5 May 2017 21:26:13 +0000 (15:26 -0600)]
Defeat @Nullable String[] with empty list.
Test: builds, boots
Bug:
37577123
Change-Id: I6bf1af565398c30aecc0939a23846c0f85c13ffe
OSDN Git Service
