OSDN Git Service
Android Build Merger (Role) [Sat, 6 May 2017 03:33:53 +0000 (03:33 +0000)]
Merge "Merge "Audio service: always unduck focus requester when granted" into oc-dev am:
8e3a8a7027 am:
f306510be0"
Tomasz Wasilczyk [Sat, 6 May 2017 03:32:53 +0000 (03:32 +0000)]
Merge "Implement step and scan calls of ITuner."
Jean-Michel Trivi [Sat, 6 May 2017 03:32:48 +0000 (03:32 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev am:
8e3a8a7027
am:
f306510be0
Change-Id: I21a3b1a63aefbe27883454682db70baa77cc4292
Colin Cross [Sat, 6 May 2017 03:31:00 +0000 (03:31 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82 am:
06a6e81c1d am:
fb18f4cfed -s ours
am:
f89107022b -s ours
Change-Id: I8d94acca20ef57885cda5cafa31c0f498c756741
nharold [Sat, 6 May 2017 03:25:24 +0000 (03:25 +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
am:
22ac87f20c
Change-Id: I8943df82ccc0f45f5d2b8bfd3c59c68403086744
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
Svetoslav Ganov [Sat, 6 May 2017 03:01:19 +0000 (03:01 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev am:
71c999febb
am:
e5d03623e7
Change-Id: If390f389b270c1c35f1ee60c09b2cf5bfecd1df1
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
Philip P. Moltmann [Sat, 6 May 2017 02:37:00 +0000 (02:37 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev am:
d19113b390
am:
889b15b4c2
Change-Id: Id60c55e06e94c3f639703beda9b249dcf0f8bd6c
Jeff Sharkey [Sat, 6 May 2017 02:29:03 +0000 (02:29 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev am:
6f4aab2c01
am:
8c921a8f14
Change-Id: Ia55b3b9666b2683e880e07071b53645ba309a57c
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
Fyodor Kupolov [Sat, 6 May 2017 02:19:41 +0000 (02:19 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev am:
748405a0f5
am:
f9c94ddef7
Change-Id: I85cde24fb6a40a61d2a38c915599d1716d88c0b8
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
Fyodor Kupolov [Sat, 6 May 2017 02:17:39 +0000 (02:17 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev am:
b4656dafc1
am:
ada0568c76
Change-Id: I6f0c5a58d59c709d31345234056ad6eca0800b1e
Roozbeh Pournader [Sat, 6 May 2017 02:09:13 +0000 (02:09 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev am:
4972daf992
am:
230e3beda5
Change-Id: Iafd6e9cb942210cb422453570c8ae54d11d50356
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:32:12 +0000 (01:32 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev am:
288f085aba
am:
0af6d8050e
Change-Id: I5686551990266e49b2fd69a00c4edcba08acc7b5
Steven Moreland [Sat, 6 May 2017 01:27:54 +0000 (01:27 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev am:
19419d00fb
am:
cce18b4496
Change-Id: I43367b23753f33ad5f611c2a43a13238592c666e
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 [Sat, 6 May 2017 01:09:40 +0000 (01:09 +0000)]
Convert libandroid and libandroid_runtime to Android.bp
am:
af737306f9
Change-Id: I58751f64dac08af9574665669b17849a6eb43c58
Nathan Harold [Sat, 6 May 2017 00:57:29 +0000 (00:57 +0000)]
Merge "Move files from frameworks/opt/telephony to frameworks/base" into oc-dev-plus-aosp
am:
a1103c0b69
Change-Id: I6bb592431410c24a74cf71bbef8f6e12e6b9544c
Yifan Hong [Sat, 6 May 2017 00:52:19 +0000 (00:52 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764 am:
7fbbc2e85d am:
31175a97b4 -s ours
am:
063078cde1 -s ours
Change-Id: I94c280f0c75f6738fdcba0ca90333dc469206cdf
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)
Yifan Hong [Sat, 6 May 2017 00:51:09 +0000 (00:51 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be am:
dd4156cb43 am:
c62e73c6a4 -s ours
am:
08db71f8fb -s ours
Change-Id: Iec829acbfa10df2b375c40259ba47e0a725def7a
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
Colin Cross [Sat, 6 May 2017 00:43:02 +0000 (00:43 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
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()
Ruben Brunk [Fri, 5 May 2017 23:59:21 +0000 (23:59 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c am:
0b34d001e4 am:
f4a9d362a8
am:
63ac3b4e57
Change-Id: I59f85042c64c12e65712fa2c0f61db800ef0dc9a
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
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:19:24 +0000 (23:19 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa am:
d1d283692f am:
5fa4ae0c33
am:
467800d44c
Change-Id: If1cfafbb80074ddf8cbd0a64109ea6619e128dce
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
Android Build Merger (Role) [Fri, 5 May 2017 22:37:15 +0000 (22:37 +0000)]
Merge "Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am:
718688f39b" into oc-dev-plus-aosp am:
d73937d3cc"
Yifan Hong [Fri, 5 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am:
718688f39b" into oc-dev-plus-aosp
am:
d73937d3cc
Change-Id: I8220845a2ac54d5793087bda676b630a765693db
Android Build Merger (Role) [Fri, 5 May 2017 22:32:36 +0000 (22:32 +0000)]
Merge "Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4" into oc-dev-plus-aosp am:
a4c63e0f18"
Colin Cross [Fri, 5 May 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Update path for libmediandk headers"
am:
9d9aab48fa
Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85
George Mount [Fri, 5 May 2017 22:31:50 +0000 (22:31 +0000)]
Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4" into oc-dev-plus-aosp
am:
a4c63e0f18
Change-Id: I57607aa763f8a7456e9cf177e11e7c60f6e1bb0b
Android Build Merger (Role) [Fri, 5 May 2017 22:31:23 +0000 (22:31 +0000)]
Merge "Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad" into oc-dev-plus-aosp am:
5bea00c721"
Suprabh Shukla [Fri, 5 May 2017 22:30:31 +0000 (22:30 +0000)]
Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad" into oc-dev-plus-aosp
am:
5bea00c721
Change-Id: I7db151479217e059d58d8d6f1987b8dd879f72d0
Android Build Merger (Role) [Fri, 5 May 2017 22:29:50 +0000 (22:29 +0000)]
Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4 am:
277e42ffdb"
George Mount [Fri, 5 May 2017 22:29:01 +0000 (22:29 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4
am:
277e42ffdb
Change-Id: I095c6fe484ea3bd6e6a5f1230cc23d43fff01cbd
Android Build Merger (Role) [Fri, 5 May 2017 22:28:35 +0000 (22:28 +0000)]
Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad am:
f7617cd1ea"
Suprabh Shukla [Fri, 5 May 2017 22:26:03 +0000 (22:26 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad
am:
f7617cd1ea
Change-Id: I4b04338ba55ba7a4da713b8391b4f84fa10627c8
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)
Suprabh Shukla [Fri, 5 May 2017 22:13:49 +0000 (22:13 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad
am:
f7617cd1ea
Change-Id: I06678ab0988596453a319a0b4ca1cd08a183172c
Kenny Root [Fri, 5 May 2017 22:10:26 +0000 (22:10 +0000)]
Merge "Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master am:
da0363104c am:
56014efbfd" into oc-dev-plus-aosp
am:
af3b2ffa3d
Change-Id: Ie0df3bb5462070e565c5d90343a2e4922df07a77
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
Felipe Leme [Fri, 5 May 2017 22:01:36 +0000 (22:01 +0000)]
Merge "Merge "Improved dump() on Autofill UI." into oc-dev am:
1f74edd2d7" into oc-dev-plus-aosp
am:
0f75698035
Change-Id: I4846ca1168433ebd117de0907de33143100135da
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
Kenny Root [Fri, 5 May 2017 21:58:54 +0000 (21:58 +0000)]
Merge changes from topic 'am-
5af6dcdbe67049bb85b1929f4c3e828d' into oc-dev-plus-aosp
am:
aeaa550ddd
Change-Id: I006b7cf80f1706bdd1a2d958cde7ba11d8465da5
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
Android Build Merger (Role) [Fri, 5 May 2017 21:55:12 +0000 (21:55 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6 am:
9172df0777 am:
76da1723bc"
Kenny Root [Fri, 5 May 2017 21:54:12 +0000 (21:54 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6 am:
9172df0777
am:
76da1723bc
Change-Id: I8e1e1a749831c90ab132df1d481ba314ec5012d5
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
Adrian Roos [Fri, 5 May 2017 21:52:59 +0000 (21:52 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches"
Suprabh Shukla [Tue, 2 May 2017 23:44:22 +0000 (16:44 -0700)]
Adding SecureTouchListener to drop suspicious touches
Added a touch listener that will drop touches if the window receiving the
touch was partly or wholly obscured by another window sitting on top of
it.
Test: N/A
Bug:
35056974
Change-Id: I4a7273bd12ae10a65c39e6b4f1c6641266dd21e4
(cherry picked from commit
395b58d6ab5ff9caa3ac358e5f1b155bab06793b)
OSDN Git Service
