OSDN Git Service
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours
am:
442fc85852
Change-Id: I1486a19f77bde9af02b7dab6f06b80b6bf0940da
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7
am:
cfbe89ad32 -s ours
Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e
Phil Weaver [Tue, 18 Jul 2017 21:57:16 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: Ic51570a1b13563cd084cd03389d4cf7f2654df8b
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f
am:
ac700bc3c7
Change-Id: If57bab0ee9d5459286339845284adb3f0163c401
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c
am:
b2e3fb162f
Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e
Phil Weaver [Tue, 18 Jul 2017 21:31:32 +0000 (21:31 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: I4d831e16f45fd2855a257551fa55182147b7bf2e
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f
am:
27ad1fbc2c
Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69
am:
783253f6db
Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours
am:
bbb567757f
Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae
am:
aa8976fa69
Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e
am:
a1dca32957
Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours
am:
f44b48acae
Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94
am:
7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c
am:
b968d99e3e
Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d
am:
cf7ce06abd -s ours
Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89
am:
83261a8b5c
Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed
am:
62eca82f89
Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c
am:
68f7106cf4
Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e
am:
e11e076fed
Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240
am:
219d9b5dfb
Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours
am:
5d46833d9c
Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5
am:
e06843fe7e
Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2
Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours
am:
76007bb240
Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2
Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours
am:
68efc2e5b5
Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e
Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e
am:
37cf6265db -s ours
Change-Id: I28f848331e5379736dd777995fe844aa5c5df689
nharold [Tue, 18 Jul 2017 20:29:07 +0000 (20:29 +0000)]
Merge "Launch NetD in a different thread" am:
c721dce3fc
am:
709f3c1d46
Change-Id: Id0a51ae3563a4956c4f81174883b43c64bdac892
Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1
am:
ccbac7e9e0 -s ours
Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37
Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6
am:
3c4d24923c -s ours
Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f
Tom Cherry [Tue, 18 Jul 2017 20:23:13 +0000 (20:23 +0000)]
Merge "Remove ALOGD_IF_SLOW" am:
b793aa8c81 -s ours
am:
3ed109136c -s ours
Change-Id: I50d0afc6af9a7462abf836e2dc5a9072b71c288b
Neil Fuller [Tue, 18 Jul 2017 20:21:07 +0000 (20:21 +0000)]
Merge "Remove a TODO associate with starting a thread" am:
c685e1e4a1
am:
d61516d7b5
Change-Id: Ia2b6fd41e3a804ec9c6e5238f6ba53495de764e9
nharold [Tue, 18 Jul 2017 20:18:10 +0000 (20:18 +0000)]
Merge "Launch NetD in a different thread"
am:
c721dce3fc
Change-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2
Steven Moreland [Tue, 18 Jul 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Reference nativehelper/jni.h as jni.h" am:
899a1f23c5
am:
d2bf323c40
Change-Id: I8bf7c9505ed31d0e248775455c0a88c836af2754
Tom Cherry [Tue, 18 Jul 2017 20:13:25 +0000 (20:13 +0000)]
Merge "Remove ALOGD_IF_SLOW"
am:
b793aa8c81 -s ours
Change-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7
Neil Fuller [Tue, 18 Jul 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Remove a TODO associate with starting a thread"
am:
c685e1e4a1
Change-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25
Steven Moreland [Tue, 18 Jul 2017 20:05:36 +0000 (20:05 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
am:
899a1f23c5
Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours
am:
954deb1c6e
Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483
Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev
am:
a620b21828 -s ours
Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf
Phil Weaver [Tue, 18 Jul 2017 18:36:21 +0000 (18:36 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours
am:
ff115bffb1
Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/
62196835
am:
fd0ca151a6
Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247
Phil Weaver [Tue, 18 Jul 2017 18:26:57 +0000 (18:26 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835
am:
24fdc53cfe -s ours
Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476
Phil Weaver [Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev
nharold [Tue, 18 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Launch NetD in a different thread"
Tom Cherry [Tue, 18 Jul 2017 17:20:39 +0000 (17:20 +0000)]
Merge "Remove ALOGD_IF_SLOW"
Treehugger Robot [Tue, 18 Jul 2017 15:17:25 +0000 (15:17 +0000)]
Merge "Remove a TODO associate with starting a thread"
Neil Fuller [Tue, 18 Jul 2017 13:02:01 +0000 (14:02 +0100)]
Remove a TODO associate with starting a thread
Switching to an alternative method to run something off
thread.
Bug:
31008728
Test: Internal automated testing / manual tests
Change-Id: Ia33ca29e8d83028a21af1dca22de75dd43eee119
Fredrik Roubert [Tue, 18 Jul 2017 11:08:47 +0000 (11:08 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
am:
253e515259
Change-Id: I064ae78ad17bef67d6e90c7ce0aed4e9693c9ac6
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Nathan Harold [Mon, 17 Jul 2017 21:01:53 +0000 (14:01 -0700)]
Launch NetD in a different thread
Calling run() launches in the current thread;
we want to call start() to launch in a separate
thread to unblock system initialization.
Bug: none
Test: compilation
Change-Id: Ia85059100add6a44a5e3262500b00ba8ca21e125
Treehugger Robot [Tue, 18 Jul 2017 02:47:33 +0000 (02:47 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
Mark Salyzyn [Mon, 17 Jul 2017 22:46:45 +0000 (22:46 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75
am:
e7715b35ea
Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4
Neil Fuller [Mon, 17 Jul 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec
am:
5c15f6d6b1
Change-Id: I967e815611149c2fd9b6ca39e9fcf9eab3b23771
Android Build Merger (Role) [Mon, 17 Jul 2017 22:41:41 +0000 (22:41 +0000)]
Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp
Neil Fuller [Mon, 17 Jul 2017 22:40:01 +0000 (22:40 +0000)]
Merge "Remove unnecessary TODOs" am:
a5c96cf4bf
am:
08cff4c76b
Change-Id: I2682cc46391b6120ac846c011bee0eab30c55e86
Benjamin Miller [Mon, 17 Jul 2017 22:39:28 +0000 (22:39 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I031f226a4324521a8940453c96da870a49767233
Mark Salyzyn [Mon, 17 Jul 2017 22:34:23 +0000 (22:34 +0000)]
Merge "BootReceiver: check console-ramoops-0"
am:
a09784ac75
Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
Neil Fuller [Mon, 17 Jul 2017 22:32:38 +0000 (22:32 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a
am:
5c2cfc51c5
Change-Id: Ia585380cb88829bf55171092389b77081d941f17
Neil Fuller [Mon, 17 Jul 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Address post-commit review comments"
am:
858634e4ec
Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b
TreeHugger Robot [Mon, 17 Jul 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
Neil Fuller [Mon, 17 Jul 2017 22:26:48 +0000 (22:26 +0000)]
Merge "Remove unnecessary TODOs"
am:
a5c96cf4bf
Change-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6
Treehugger Robot [Mon, 17 Jul 2017 22:24:39 +0000 (22:24 +0000)]
Merge "BootReceiver: check console-ramoops-0"
Neil Fuller [Mon, 17 Jul 2017 22:24:36 +0000 (22:24 +0000)]
Merge "Remove TODOs that are not needed"
am:
0f9842304a
Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
Neil Fuller [Mon, 17 Jul 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Address post-commit review comments"
Neil Fuller [Mon, 17 Jul 2017 22:15:42 +0000 (22:15 +0000)]
Merge "Remove unnecessary TODOs"
Neil Fuller [Mon, 17 Jul 2017 22:15:08 +0000 (22:15 +0000)]
Merge "Remove TODOs that are not needed"
xutianguo [Mon, 17 Jul 2017 22:04:56 +0000 (22:04 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea
am:
75bd16d2df
Change-Id: I92e4e1268f6a7832cbc99396749eb7b89b19a57a
xutianguo [Mon, 17 Jul 2017 21:58:04 +0000 (21:58 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
am:
66af025fea
Change-Id: Iab47add488fd9f4e09f2d0a2aacb435b0cdb24d0
Treehugger Robot [Mon, 17 Jul 2017 21:47:31 +0000 (21:47 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
Mark Salyzyn [Fri, 14 Jul 2017 20:08:47 +0000 (13:08 -0700)]
BootReceiver: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0
Test: none
Bug:
63058217
Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f
Tom Cherry [Mon, 17 Jul 2017 19:26:01 +0000 (19:26 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
am:
d600905e4a
Change-Id: I6366391c3bb0c8df8d15427d32369f180c3f2060
Tom Cherry [Mon, 17 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
Steven Moreland [Mon, 17 Jul 2017 19:08:45 +0000 (12:08 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I8d2e9587439efa2d6ab03a5bdfa749fc620759e1
xutianguo [Mon, 22 May 2017 06:03:33 +0000 (14:03 +0800)]
Make BluetoothStateChangeCallback oneway to prevent waiting on response.
Test: Connected bluetooth devices(included Headset/HID devices), and
made bluetooth enabling/disabling over 1000 times, no other side effect
observed.
Bug:
38485770
Change-Id: Ia3959d2441aece39a79ab2d662b57790a78df674
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
(cherry picked from commit
95e1e21a639318bb3399c394707624393cfa2300)
Benjamin Miller [Mon, 17 Jul 2017 11:01:35 +0000 (13:01 +0200)]
Docs-change: clarification of LauncherApps.getApplicationInfo()
Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)
Test: make ds-docs and output staged
Bug:
38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc
nharold [Mon, 17 Jul 2017 18:05:19 +0000 (18:05 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437
am:
e38e57c25d
Change-Id: I59a8143162800f35748b1e145973743855faca09
Fredrik Roubert [Mon, 17 Jul 2017 17:58:05 +0000 (17:58 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours
am:
cd53e91851
Change-Id: I9c1955309c1669c49b0f7060c22de4767360a7c4
nharold [Mon, 17 Jul 2017 17:52:25 +0000 (17:52 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
am:
d1ffb13437
Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec
Fredrik Roubert [Mon, 17 Jul 2017 17:50:02 +0000 (17:50 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
am:
0f3d90eec8 -s ours
Change-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83
Neil Fuller [Mon, 17 Jul 2017 17:02:29 +0000 (18:02 +0100)]
Remove unnecessary TODOs
The classes under test are not part of a public
API so they are not tested via CTS.
Bug:
31008728
Test: make droid
Change-Id: If10db42b6e79728a6625708d35a04c5002164866
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Remove TODOs that are not needed
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).
Bug:
31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
nharold [Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
Treehugger Robot [Mon, 17 Jul 2017 16:46:09 +0000 (16:46 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
Benjamin Miller [Mon, 17 Jul 2017 14:22:24 +0000 (14:22 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am:
ca007e525b
Change-Id: Ife96d44a6c8687be49616562f1834c1e2cc17b7d
TreeHugger Robot [Mon, 17 Jul 2017 14:11:55 +0000 (14:11 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:55:37 +0000 (10:55 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0" am:
29926838d4
am:
40dfadda77
Change-Id: I8b74cd195f4133e478a63ad2066856ebe32b6231
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:48:50 +0000 (10:48 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0"
am:
29926838d4
Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:37:35 +0000 (10:37 +0000)]
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Mathieu Chartier [Fri, 14 Jul 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Add more details to dumpsys meminfo -d" am:
4ccf8b83a1
am:
41718e2413
Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b
Mathieu Chartier [Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)]
Merge "Add more details to dumpsys meminfo -d"
am:
4ccf8b83a1
Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904
Treehugger Robot [Fri, 14 Jul 2017 21:21:39 +0000 (21:21 +0000)]
Merge "Add more details to dumpsys meminfo -d"
Tom Cherry [Mon, 10 Jul 2017 21:31:18 +0000 (14:31 -0700)]
Remove ALOGD_IF_SLOW
ALOGD_IF_SLOW isn't intuitively implemented as it cannot handle
temporaries used as its parameters. Since there are so few users of
it already and since it's just sugar on top of 2 otherwise trivial
lines, we opt to remove it entirely.
Bug:
62820330
Test: Build
Change-Id: I196443b3717497f6cab31bfaee94a229e4838556
Merged-In: I196443b3717497f6cab31bfaee94a229e4838556
Mathieu Chartier [Thu, 13 Jul 2017 22:01:34 +0000 (15:01 -0700)]
Add more details to dumpsys meminfo -d
Added new subitems for
.dex:
boot vdex
app vdex
app odex
.art
app art
boot art
Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.
Sample output:
261,892K: Native
213,196K: .dex mmap
111,620K: .App vdex
65,070K: .App dex
36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
74,656K: .Heap
4,526K: .Zygote
4,218K: .LOS
2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
32,704K: .LinearAlloc
3,672K: .JITCache
3,248K: .IndirectRef
3,204K: .GC
40,754K: .art mmap
31,133K: .Boot art
9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack
Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>
Bug:
32331673
(cherry picked from commit
95550dd39440196d364767fc18d441ed5a0e36d6)
Change-Id: I7557ee09510651c7b5ddee646c92adbcdd3472db