Steven Moreland
238be4a67b
Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5
...
am: d2bf323c40
2017-07-18 20:15:54 +00:00
Steven Moreland
d2bf323c40
Merge "Reference nativehelper/jni.h as jni.h"
...
am: 899a1f23c5
2017-07-18 20:05:36 +00:00
Fredrik Roubert
042534c352
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
...
am: 253e515259
2017-07-18 11:08:47 +00:00
Fredrik Roubert
253e515259
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
2017-07-18 11:13:48 +01:00
Treehugger Robot
899a1f23c5
Merge "Reference nativehelper/jni.h as jni.h"
2017-07-18 02:47:33 +00:00
Mark Salyzyn
be25a82472
Merge "BootReceiver: check console-ramoops-0" am: a09784ac75
...
am: e7715b35ea
2017-07-17 22:46:45 +00:00
Neil Fuller
1a35cf3892
Merge "Address post-commit review comments" am: 858634e4ec
...
am: 5c15f6d6b1
2017-07-17 22:44:54 +00:00
Android Build Merger (Role)
c8eaf5a3a4
Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp
2017-07-17 22:41:41 +00:00
Neil Fuller
bae79dab29
Merge "Remove unnecessary TODOs" am: a5c96cf4bf
...
am: 08cff4c76b
2017-07-17 22:40:01 +00:00
Benjamin Miller
84a4d3de65
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
...
am: d726ff988c
2017-07-17 22:39:28 +00:00
Mark Salyzyn
e7715b35ea
Merge "BootReceiver: check console-ramoops-0"
...
am: a09784ac75
2017-07-17 22:34:23 +00:00
Neil Fuller
444616f4bf
Merge "Remove TODOs that are not needed" am: 0f9842304a
...
am: 5c2cfc51c5
2017-07-17 22:32:38 +00:00
Neil Fuller
5c15f6d6b1
Merge "Address post-commit review comments"
...
am: 858634e4ec
2017-07-17 22:32:37 +00:00
TreeHugger Robot
d726ff988c
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
2017-07-17 22:28:09 +00:00
Neil Fuller
08cff4c76b
Merge "Remove unnecessary TODOs"
...
am: a5c96cf4bf
2017-07-17 22:26:48 +00:00
Treehugger Robot
a09784ac75
Merge "BootReceiver: check console-ramoops-0"
2017-07-17 22:24:39 +00:00
Neil Fuller
5c2cfc51c5
Merge "Remove TODOs that are not needed"
...
am: 0f9842304a
2017-07-17 22:24:36 +00:00
Neil Fuller
858634e4ec
Merge "Address post-commit review comments"
2017-07-17 22:19:07 +00:00
Neil Fuller
a5c96cf4bf
Merge "Remove unnecessary TODOs"
2017-07-17 22:15:42 +00:00
Neil Fuller
0f9842304a
Merge "Remove TODOs that are not needed"
2017-07-17 22:15:08 +00:00
xutianguo
cf6e784219
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am: 66af025fea
...
am: 75bd16d2df
2017-07-17 22:04:56 +00:00
xutianguo
75bd16d2df
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
...
am: 66af025fea
2017-07-17 21:58:04 +00:00
Treehugger Robot
66af025fea
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
2017-07-17 21:47:31 +00:00
Mark Salyzyn
18c139c57f
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
2017-07-17 20:33:40 +00:00
Tom Cherry
94f7e0f7b9
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
...
am: d600905e4a
2017-07-17 19:26:01 +00:00
Tom Cherry
d600905e4a
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
2017-07-17 19:20:58 +00:00
Steven Moreland
889f9952d8
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
2017-07-17 12:08:45 -07:00
xutianguo
a5325e18df
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)
2017-07-17 11:52:24 -07:00
Benjamin Miller
7afa84c373
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
2017-07-17 18:35:38 +00:00
nharold
43d17a6785
Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb13437
...
am: e38e57c25d
2017-07-17 18:05:19 +00:00
Fredrik Roubert
28f67840c6
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am: 0f3d90eec8 -s ours
...
am: cd53e91851
2017-07-17 17:58:05 +00:00
nharold
e38e57c25d
Merge "Check ManagedResource is NonNull before Checking Owner"
...
am: d1ffb13437
2017-07-17 17:52:25 +00:00
Fredrik Roubert
cd53e91851
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
...
am: 0f3d90eec8
2017-07-17 17:50:02 +00:00
Neil Fuller
8f4a536114
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
2017-07-17 18:02:29 +01:00
Neil Fuller
a9f0eeb36f
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
2017-07-17 17:57:11 +01:00
nharold
d1ffb13437
Merge "Check ManagedResource is NonNull before Checking Owner"
2017-07-17 16:57:01 +00:00
Treehugger Robot
0f3d90eec8
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
2017-07-17 16:46:09 +00:00
Benjamin Miller
3082216de2
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
...
am: ca007e525b
2017-07-17 14:22:24 +00:00
TreeHugger Robot
ca007e525b
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
2017-07-17 14:11:55 +00:00
Fredrik Roubert
adf11aef0f
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
2017-07-17 14:28:18 +02:00
Przemyslaw Szczepaniak
004ae3ae71
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4
...
am: 40dfadda77
2017-07-17 10:55:37 +00:00
Przemyslaw Szczepaniak
40dfadda77
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
...
am: 29926838d4
2017-07-17 10:48:50 +00:00
Przemyslaw Szczepaniak
29926838d4
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
2017-07-17 10:37:35 +00:00
Peng Xu
6c5ee3d894
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
...
am: 17e641dae5
2017-07-14 23:07:11 +00:00
TreeHugger Robot
17e641dae5
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
2017-07-14 22:55:15 +00:00
Mathieu Chartier
811fa6d001
Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1
...
am: 41718e2413
2017-07-14 21:47:03 +00:00
Mathieu Chartier
41718e2413
Merge "Add more details to dumpsys meminfo -d"
...
am: 4ccf8b83a1
2017-07-14 21:37:43 +00:00
Treehugger Robot
4ccf8b83a1
Merge "Add more details to dumpsys meminfo -d"
2017-07-14 21:21:39 +00:00
Tom Cherry
9236117288
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
2017-07-14 19:51:44 +00:00
Mathieu Chartier
cb86245b99
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 95550dd394
2017-07-14 12:14:59 -07:00
