OSDN Git Service
Lucas Dupin [Wed, 3 May 2017 19:42:58 +0000 (12:42 -0700)]
Get wallpaper colors from thumbnail
Live wallpapers now have a default color extraciton implementation.
We'll try to pick colors from their thumbnails.
Bug:
37952518
Test: manual
Change-Id: I2915cbab673e39cd5e4686fe8e271ac2d4587436
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
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
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
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
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)
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
Kenny Root [Fri, 5 May 2017 21:46:33 +0000 (21:46 +0000)]
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f am:
4fd0b06ac7
am:
7df412a6bf
Change-Id: I0370e860601df7e333c1b0a0e68c5b115ec8361a
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
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
Kenny Root [Fri, 5 May 2017 21:25:56 +0000 (21:25 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
am:
da0363104c
Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878
Kenny Root [Fri, 5 May 2017 21:19:11 +0000 (21:19 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74
am:
37607dfca6
Change-Id: Iaa67f9512dd0447487b42d655c03c3c445068837
Android Build Merger (Role) [Fri, 5 May 2017 21:18:53 +0000 (21:18 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
Kenny Root [Fri, 5 May 2017 21:18:09 +0000 (21:18 +0000)]
Track updates to Conscrypt am:
7fdce769c3
am:
0634c4f77f
Change-Id: I9cdad70a06353e3451cc3c1d4e1237f42b91fa24
Kenny Root [Fri, 5 May 2017 21:16:47 +0000 (21:16 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ifa261c6c003f3e0ca767356bc98c2c3033bd699a
Hyunyoung Song [Fri, 5 May 2017 21:15:21 +0000 (21:15 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev am:
52eba0ad70
am:
3c69ff323a
Change-Id: I146034df4aaf54d137897855f60133859deb45cc
Kenny Root [Fri, 5 May 2017 21:10:11 +0000 (21:10 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ie3b9d74ff46be9e4b00c6efe6748feb5e096cd3a
Hyunyoung Song [Fri, 5 May 2017 21:09:23 +0000 (21:09 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
am:
52eba0ad70
Change-Id: I0bf917bccbd2747ea18049577f5d79fe457eea4f
Kenny Root [Fri, 5 May 2017 21:08:48 +0000 (21:08 +0000)]
Track updates to Conscrypt
am:
7fdce769c3
Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71
Kenny Root [Fri, 5 May 2017 21:00:38 +0000 (21:00 +0000)]
Merge changes from topic 'update-conscrypt'
* changes:
Delete obsolete and unused KeyStoreTests
Track updates to Conscrypt
Jack Yu [Fri, 5 May 2017 20:58:31 +0000 (20:58 +0000)]
Merge "Moved channels settings from carrier config to resources"
Hyunyoung Song [Fri, 5 May 2017 20:52:48 +0000 (20:52 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 20:41:59 +0000 (20:41 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev am:
6dcae2b91f
am:
4aeea2404c
Change-Id: I2ef8f172023446def205cfd0b3e6384ab12fee7a
Akira Oshimi [Fri, 5 May 2017 20:38:47 +0000 (20:38 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev am:
ea4e770ed9
am:
29d4a4bb5c
Change-Id: Id6dd28e0c3c632b1df66824c5e6fd106323ae3f4
Abodunrinwa Toki [Fri, 5 May 2017 20:35:04 +0000 (20:35 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
am:
6dcae2b91f
Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095
Akira Oshimi [Fri, 5 May 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
am:
ea4e770ed9
Change-Id: I0f385dd77dd42d1ad8ddc3784c0b5c8d1181a596
TreeHugger Robot [Fri, 5 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
Makoto Onuki [Fri, 5 May 2017 20:24:45 +0000 (20:24 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev am:
9ccb15a351
am:
f14f38ba4a
Change-Id: Idba763e56af1fa6e76ddbb3d8880f7eb78c944f3
Rebecca Silberstein [Fri, 5 May 2017 20:22:42 +0000 (20:22 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev am:
52fbde5255
am:
dd28278023
Change-Id: I8e56318a4d62330d31fb129439cd3ed26305f13a
Makoto Onuki [Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
am:
9ccb15a351
Change-Id: I7f246f362b6e8d124416db790e4856e52baa21b8
Colin Cross [Fri, 5 May 2017 20:13:30 +0000 (20:13 +0000)]
Update path for libmediandk headers
am:
0ece443558
Change-Id: Ie20fb4e2f256f31bbe1d414be15d4a91e0fcd1e2
Rebecca Silberstein [Fri, 5 May 2017 20:11:22 +0000 (20:11 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
am:
52fbde5255
Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f
Makoto Onuki [Fri, 5 May 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
TreeHugger Robot [Fri, 5 May 2017 20:04:14 +0000 (20:04 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 20:03:50 +0000 (20:03 +0000)]
Merge "Merge "Create auxiliary info for local instant apps" into oc-dev am:
4804e41574 am:
143ad7ff09"
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Todd Kennedy [Fri, 5 May 2017 20:02:48 +0000 (20:02 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev am:
4804e41574
am:
143ad7ff09
Change-Id: I7bde4770ba29b8e57acd62cbe3a56c986a99bc80
Colin Cross [Fri, 5 May 2017 20:02:00 +0000 (20:02 +0000)]
Merge "Update path for libmediandk headers"
Todd Kennedy [Fri, 5 May 2017 19:56:16 +0000 (19:56 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
4804e41574
Change-Id: I181cb62756b16971b126c2174eea58788dd5bfea
Sergey Vasilinets [Fri, 5 May 2017 19:56:10 +0000 (19:56 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev am:
01a5cc9004
am:
9c29d93ee3
Change-Id: I85f853aee80cbe9659c646468d35fbd15a5a45d4
Sergey Vasilinets [Fri, 5 May 2017 19:51:04 +0000 (19:51 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am:
01a5cc9004
Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da
TreeHugger Robot [Fri, 5 May 2017 19:43:43 +0000 (19:43 +0000)]
Merge "Implement CACert queries in SecurityController"
OSDN Git Service
