OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:50 +0000 (21:09 +0000)]
Merge "Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master am:
2e8ba8dd5c" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66 am:
24a1598b5b" into oc-dev-plus-aosp
Colin Cross [Thu, 6 Jul 2017 21:09:05 +0000 (21:09 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
am:
2e8ba8dd5c
Change-Id: I8b8b8cfb2f8671726d1661e7e9b634f2ac374930
Colin Cross [Thu, 6 Jul 2017 21:08:21 +0000 (21:08 +0000)]
Merge "Enable priority boost for non-Jack builds." am:
847c70da66
am:
24a1598b5b
Change-Id: If65490df9f24444efa1040cfad1b2a1afe803afa
Colin Cross [Thu, 6 Jul 2017 21:07:27 +0000 (21:07 +0000)]
Merge "Enable priority boost for non-Jack builds." am:
847c70da66
am:
24a1598b5b
Change-Id: I8303e4193e4eccafa83253429b24bf9cc49234dc
Android Build Merger (Role) [Thu, 6 Jul 2017 21:04:29 +0000 (21:04 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
Colin Cross [Thu, 6 Jul 2017 21:03:01 +0000 (21:03 +0000)]
Merge "Enable priority boost for non-Jack builds."
am:
847c70da66
Change-Id: Ie3e16e7452404b5d83d87c5f4d86abb94f7e1c6b
Colin Cross [Thu, 6 Jul 2017 21:02:04 +0000 (21:02 +0000)]
Merge "Enable priority boost for non-Jack builds."
am:
847c70da66
Change-Id: I2172acbf465cf19c3af7388309367b77750c4ac0
Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]
Merge "Enable priority boost for non-Jack builds."
Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:02 +0000 (20:28 +0000)]
Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp
Yifan Hong [Thu, 6 Jul 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c
am:
90a5fd0549
Change-Id: I241c75ad6dbf4a5a450b6b1a0e1f8e65d57c4632
Yifan Hong [Thu, 6 Jul 2017 20:26:21 +0000 (20:26 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c
am:
90a5fd0549
Change-Id: I6b96299e8480a7cdd64e6c3ca8ac1e3946971000
Yifan Hong [Thu, 6 Jul 2017 20:21:51 +0000 (20:21 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
am:
54b1e9c57c
Change-Id: I07f9797bcf9a32a3c9b517741e7cbef17d5a5382
Yifan Hong [Thu, 6 Jul 2017 19:48:26 +0000 (19:48 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
Alan Leung [Wed, 14 Jun 2017 20:50:45 +0000 (13:50 -0700)]
Enable priority boost for non-Jack builds.
Test: m ANDROID_COMPILE_WITH_JACK=false / checked for boost+reset calls.
BUG:
36791701
Change-Id: I5fb4107ae39e76644c01c502483ae7d887ab18a3
Merged-In: I5fb4107ae39e76644c01c502483ae7d887ab18a3
(cherry picked from commit
421baeb9289cd5a16e2fef5601dcddbbfad8eb3e)
Android Build Merger (Role) [Thu, 6 Jul 2017 19:00:56 +0000 (19:00 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp
Andrew Solovay [Thu, 6 Jul 2017 18:59:28 +0000 (18:59 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I502f2dcf60a9010f336b522005d6982d522d9b1d
Andrew Solovay [Thu, 6 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I5fb70c606842dd5af7fdb5506d7a0d14e83aeab9
Andrew Solovay [Thu, 6 Jul 2017 18:42:13 +0000 (18:42 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 18:42:05 +0000 (18:42 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
7e97085ee7
Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a
Android Build Merger (Role) [Thu, 6 Jul 2017 18:39:03 +0000 (18:39 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:38:02 +0000 (18:38 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:37:59 +0000 (18:37 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I7a352def470a54916129fb9fc90239658847a02f
Hall Liu [Thu, 6 Jul 2017 18:36:42 +0000 (18:36 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1
Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f
Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31
Android Build Merger (Role) [Thu, 6 Jul 2017 18:26:39 +0000 (18:26 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
Hall Liu [Thu, 6 Jul 2017 18:24:49 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am:
6ba3829074
Change-Id: Ied8d6168fc625600c865c1980bb82da0f919e02b
Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am:
6ba3829074
Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af
Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396
Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:28 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:00 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:11:55 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9
Erik Kline [Thu, 6 Jul 2017 08:11:44 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: I462aa9d52205b1dff46b074e5a13945c34e96890
Android Build Merger (Role) [Thu, 6 Jul 2017 08:11:03 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:10:00 +0000 (08:10 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: Iae705d2522f1a21e7aa970a4c16efd41943031ab
Erik Kline [Thu, 6 Jul 2017 08:09:13 +0000 (08:09 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: I9097493cec6ac13dc027ee1d2f13bbe52679e674
Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e
Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe
Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521
Android Build Merger (Role) [Thu, 6 Jul 2017 03:33:18 +0000 (03:33 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:31:51 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
am:
e62a5fc7d3
Change-Id: I1c87dc82499ac1a53ba3a6c14d79586b4d7db986
Android Build Merger (Role) [Thu, 6 Jul 2017 03:31:10 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:29:49 +0000 (03:29 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I80156aebfba5f0a8e914163b420a2676658e9826
Mathieu Chartier [Thu, 6 Jul 2017 03:28:05 +0000 (03:28 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I213eef696c40c0260b32c71fac18b1e5063dc77d
Android Build Merger (Role) [Thu, 6 Jul 2017 03:25:23 +0000 (03:25 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
Mathieu Chartier [Thu, 6 Jul 2017 03:23:39 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I8ea2d783c0e9c749e923b7a37b2268d0c186851e
Mathieu Chartier [Thu, 6 Jul 2017 03:23:21 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I3347a5b4d3df895b7066c5117f37003e4603ebd9
Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]
Merge "ProcessStats: fix uss average value offset"
Android Build Merger (Role) [Thu, 6 Jul 2017 02:18:06 +0000 (02:18 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:15:43 +0000 (02:15 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: I297c4d5917b63f0215c2907f32b8e23d0f4ee4bf
Hall Liu [Thu, 6 Jul 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: Ie3c620a0e45f85ef0446d6d58865d6f55b731531
Hall Liu [Thu, 6 Jul 2017 02:10:30 +0000 (02:10 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f
am:
5e7c98bb6a
Change-Id: Ie5a323b8a0c96f7a7f63eea1b0163bb7e5bf4ea7
daqi [Wed, 28 Jun 2017 06:16:13 +0000 (14:16 +0800)]
Fix ContentObserver unregister issue
[Cause of Defect]
In the ContentObserver callback procedure, the binder thread
has no sync mechanism with handler thread.
The ContentObserver#onChange method can get called after
ContentResolver#unregisterContentObserver called in the
very low probability.
Bug: https://issuetracker.google.com/issues/
63154326
Test: manual - check https://github.com/nanjingdaqi/ContentObserverDemo
Change-Id: I0e3831eba7a9cc1a5bf0d30abe5dd0ec8259b0d4
Signed-off-by: daqi <daqi@xiaomi.com>
Android Build Merger (Role) [Thu, 6 Jul 2017 02:05:16 +0000 (02:05 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
Hall Liu [Thu, 6 Jul 2017 02:03:42 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb
Hall Liu [Thu, 6 Jul 2017 02:03:16 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I4c822f653900cab34276b2b4ba5fb1a29e948a76
Android Build Merger (Role) [Thu, 6 Jul 2017 01:55:35 +0000 (01:55 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:54:37 +0000 (01:54 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
am:
17f2f1633b
Change-Id: Icfc920a97ab07f01f9c5d9def88f4bcc63bd6058
Android Build Merger (Role) [Thu, 6 Jul 2017 01:53:59 +0000 (01:53 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:53:01 +0000 (01:53 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I588cd14481ed540dacd85646f52e7b98d1bc58b9
Hiroki Yamamoto [Thu, 6 Jul 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I7e45537f7a81ac42be1a24adeadfbf3f7b665109
Hall Liu [Thu, 6 Jul 2017 01:52:04 +0000 (01:52 +0000)]
Merge "Update DownloadRequest API"
Android Build Merger (Role) [Thu, 6 Jul 2017 01:47:37 +0000 (01:47 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
Hiroki Yamamoto [Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am:
21187ba5cc
Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d
Hiroki Yamamoto [Thu, 6 Jul 2017 01:45:13 +0000 (01:45 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am:
21187ba5cc
Change-Id: Iae5a62d77719833dc91c881bd3b90c9ab327a0bf
Treehugger Robot [Thu, 6 Jul 2017 01:30:10 +0000 (01:30 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
Android Build Merger (Role) [Thu, 6 Jul 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:51:40 +0000 (00:51 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
am:
6340d93571
Change-Id: Ic206b34a0535c3a8c92e45c3107d4f16985a5cb8
Android Build Merger (Role) [Thu, 6 Jul 2017 00:50:59 +0000 (00:50 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:49:52 +0000 (00:49 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: Iec17e43ba2df36ef45a55f7055886df7505296af
Erik Kline [Thu, 6 Jul 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: I87dbd0a8840e57c7959a935e17654a3a4e1b3edf
Android Build Merger (Role) [Thu, 6 Jul 2017 00:43:51 +0000 (00:43 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 00:42:14 +0000 (00:42 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: I7789242c6f574c1d81eb0a5e9527b167d4b3c755
Erik Kline [Thu, 6 Jul 2017 00:41:33 +0000 (00:41 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: Iea47f74dc77b347343726d2ab0ee128e5391767b
Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
Hiroki Yamamoto [Fri, 14 Apr 2017 06:10:15 +0000 (15:10 +0900)]
Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover
Test: do Nfc Bluetooth Handover and wait for the timeout
Bug:
63250718
Change-Id: Ieea8b8f7a07fe90a594ed13ecfefd01e1d60853d
Yifan Hong [Wed, 5 Jul 2017 23:39:51 +0000 (16:39 -0700)]
Log errors on android.os.VintfObject.verify()
Test: pass
Bug:
63290683
Change-Id: I7ddc355024359e31aca4bbdf18f42075f72ddd5a
Android Build Merger (Role) [Wed, 5 Jul 2017 22:59:10 +0000 (22:59 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I6d68ea194068c674d5e79a01d9ce05b9674dc16b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:56:05 +0000 (22:56 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:55:11 +0000 (22:55 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:53:14 +0000 (22:53 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I7f960d0d7e41ed89e422560318a73dad92562c87
Android Build Merger (Role) [Wed, 5 Jul 2017 22:52:17 +0000 (22:52 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:52:14 +0000 (22:52 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I393799a36639f94583726be4176ef8d436aee932
Android Build Merger (Role) [Wed, 5 Jul 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:50:21 +0000 (22:50 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I724ab35811887b1fd4ab2222046ed1123fc4b4cc
OSDN Git Service
