OSDN Git Service
Nandana Dutt [Thu, 14 Mar 2019 17:45:22 +0000 (10:45 -0700)]
Merge "dumpstate: Log duration only if significant" am:
48159a81be
am:
ec1ee7d8a4
Change-Id: Ia1548988f8acc3d17a1e99427d494d9f0aa489b2
Nandana Dutt [Thu, 14 Mar 2019 17:37:43 +0000 (10:37 -0700)]
Merge "dumpstate: Log duration only if significant"
am:
48159a81be
Change-Id: Ia273ed733289bcf80bb8f5c2c0543c372ad888ef
Treehugger Robot [Thu, 14 Mar 2019 17:15:24 +0000 (17:15 +0000)]
Merge "dumpstate: Log duration only if significant"
Gavin Corkery [Thu, 14 Mar 2019 14:31:24 +0000 (07:31 -0700)]
Merge "Rename data/pkg_staging to data/app-staging" am:
4308cc478d
am:
fca4a38c18
Change-Id: Ie2e1fbe9bb114a3fa32827a79b751b27f86236f7
Gavin Corkery [Thu, 14 Mar 2019 14:22:04 +0000 (07:22 -0700)]
Merge "Rename data/pkg_staging to data/app-staging"
am:
4308cc478d
Change-Id: I3c1bfc034350839336395086504f513cd8a71002
Gavin Corkery [Thu, 14 Mar 2019 14:14:38 +0000 (14:14 +0000)]
Merge "Rename data/pkg_staging to data/app-staging"
Nandana Dutt [Thu, 14 Mar 2019 11:04:22 +0000 (11:04 +0000)]
dumpstate: Log duration only if significant
Ignore durations shorter than 500ms. Also adjust
the precision of the duration logged accordingly.
This is to avoid log spam.
Test: verified logcat on bugreport
Change-Id: Ibcef6b107de4327f769242c0c43d7f5317eee7f6
Gavin Corkery [Wed, 27 Feb 2019 12:24:19 +0000 (12:24 +0000)]
Rename data/pkg_staging to data/app-staging
Test: atest apex_e2e_tests
Bug:
126330086
(cherry picked from commit
950d5b4b8a55bda5874bfa75f3bcadf7160446a0)
Change-Id: Id98ecbad4f9452bc40a628ceb8c50ce20453d7ad
Merged-In: Id98ecbad4f9452bc40a628ceb8c50ce20453d7ad
Martijn Coenen [Wed, 13 Mar 2019 12:13:45 +0000 (05:13 -0700)]
Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process."" am:
1f69a63dda
am:
10fd717a0f
Change-Id: I9d4e1cddf0571395dc17f9a077d8eb35a47ba5ed
Martijn Coenen [Wed, 13 Mar 2019 12:09:33 +0000 (05:09 -0700)]
Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process.""
am:
1f69a63dda
Change-Id: Idcd26a40071e8a81d9d89edb275d61a159d205aa
Martijn Coenen [Wed, 13 Mar 2019 11:53:54 +0000 (11:53 +0000)]
Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process.""
Martijn Coenen [Wed, 13 Mar 2019 11:51:08 +0000 (11:51 +0000)]
Revert "libbinder: Choose the binder driver at runtime based on system/vendor process."
This reverts commit
46f95536bec334f8472ea92a7697c37602337398.
Reason for revert: appears to break (some?) native tests, which start looking for binder services in /dev/vndbinder
Change-Id: Id27d90e484d23a5975869729fa274213a9b1e1e4
Xin Li [Wed, 13 Mar 2019 05:56:40 +0000 (22:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am:
873f499994 -s ours
am:
5f1378fdf0 -s ours
am skip reason: subject contains skip directive
Change-Id: I591fb21120ff991d87dacfbddb424aa0d953025d
Xin Li [Wed, 13 Mar 2019 05:33:42 +0000 (22:33 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am:
b126899aa4 -s ours
am:
e052c76c33 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf54e9a67888eb22307878b9ba5b8aca60c4b53c
Jayant Chowdhary [Wed, 13 Mar 2019 05:32:11 +0000 (22:32 -0700)]
Merge "libbinder: Choose the binder driver at runtime based on system/vendor process." am:
81a91bd83e
am:
0b31480ec5
Change-Id: Ieb168a40bb9fd087293c2acb9d82590561b2dd06
Xin Li [Wed, 13 Mar 2019 05:19:33 +0000 (22:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am:
873f499994 -s ours
am skip reason: subject contains skip directive
Change-Id: I5a5b3e970313b090e759c8d39f655855e8609200
Xin Li [Wed, 13 Mar 2019 04:46:50 +0000 (21:46 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am:
b126899aa4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieeaac3cba2372d4865faa3338d22c194411880e0
Jayant Chowdhary [Wed, 13 Mar 2019 04:45:25 +0000 (21:45 -0700)]
Merge "libbinder: Choose the binder driver at runtime based on system/vendor process."
am:
81a91bd83e
Change-Id: Ied00c256d04718f6bfa85ed4ccdeddf90b9f8ec6
Xin Li [Wed, 13 Mar 2019 02:26:03 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Jayant Chowdhary [Wed, 13 Mar 2019 00:07:05 +0000 (00:07 +0000)]
Merge "libbinder: Choose the binder driver at runtime based on system/vendor process."
Jayant Chowdhary [Fri, 8 Mar 2019 18:08:20 +0000 (10:08 -0800)]
libbinder: Choose the binder driver at runtime based on system/vendor process.
This is needed since llndk libraries may cause the system variant of libbinder (and therefore
compile time checks are not enough) to be loaded in a vendor process. In that case, it should not be
initing the driver with /dev/binder. It should use /dev/vndbinder instead.
Bug:
124128212
Test: Device boots
Test: play YouTube videos, use camera to take pictures / record video (sanity) on devices supporting
legacy vndk(sailfish) and also devices supporting current vndk.
Change-Id: Ia5581efa04c8d4adc6af39668b0aa98e84324a27
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
Nandana Dutt [Tue, 12 Mar 2019 10:38:53 +0000 (03:38 -0700)]
Merge "Dumpstate: Refactor DumpHals" am:
b0f2b48c0a
am:
432ff435a0
Change-Id: I6e1e552abbdcdd732ab4a0dfea4b0b3d0ea1d152
Nandana Dutt [Tue, 12 Mar 2019 10:34:39 +0000 (03:34 -0700)]
Merge "Dumpstate: Refactor DumpHals"
am:
b0f2b48c0a
Change-Id: I8b6bcb887675d907e21bb818cf0408d54d975b14
Nandana Dutt [Tue, 12 Mar 2019 10:24:43 +0000 (10:24 +0000)]
Merge "Dumpstate: Refactor DumpHals"
Mohammad Samiul Islam [Mon, 11 Mar 2019 21:13:46 +0000 (14:13 -0700)]
Merge "Add new emails to OWNER file" am:
4000dd6f03
am:
cc227a2077
Change-Id: I0d4832c336e368b9a77124e5ceaf1c56d40af7c8
Mohammad Samiul Islam [Mon, 11 Mar 2019 20:21:58 +0000 (13:21 -0700)]
Merge "Add new emails to OWNER file"
am:
4000dd6f03
Change-Id: I1c1b94062eb5cbfdfc6677fe5aa422288dda1d67
Treehugger Robot [Mon, 11 Mar 2019 19:05:50 +0000 (19:05 +0000)]
Merge "Add new emails to OWNER file"
Nandana Dutt [Mon, 11 Mar 2019 16:33:24 +0000 (16:33 +0000)]
Dumpstate: Refactor DumpHals
Prefactoring to handle user consent denial sooner.
BUG:
128270426
Test: "adb shell bugreport" for flat file bugreports works
Change-Id: Ifba9ec600ab7fe23b046414fd718220cd07a39d2
Xin Li [Mon, 11 Mar 2019 16:28:24 +0000 (09:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
am:
d17734605a -s ours
am skip reason: subject contains skip directive
Change-Id: I1e66556e17447f4ee6f91e4cdc5b7e06bf9a3aa7
Mohammad Samiul Islam [Mon, 11 Mar 2019 15:11:58 +0000 (15:11 +0000)]
Add new emails to OWNER file
Test: builds successfully
Change-Id: I080d4cd20290f3662087ccb5034d09c43311ecfb
The Android Open Source Project [Mon, 11 Mar 2019 16:21:30 +0000 (09:21 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
am:
a81b60e688 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie9cf562b4514f735edad3ecb1d39da1340f79972
Xin Li [Mon, 11 Mar 2019 16:13:29 +0000 (09:13 -0700)]
DO NOT MERGE - Merge PPRL.190305.001 into master
Bug:
127812889
Change-Id: I1cb1c38609ee26bb7c3e7343a9ed4c85fb4fb0a6
Xin Li [Mon, 11 Mar 2019 16:09:43 +0000 (16:09 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
Nandana Dutt [Mon, 11 Mar 2019 14:27:25 +0000 (07:27 -0700)]
Merge "Log duration to logcat always." am:
ea7255933e
am:
feac19c1e0
Change-Id: I11c51f2ed8088f38dbe8881e8ca97a8c85b8a0c7
Nandana Dutt [Mon, 11 Mar 2019 14:23:10 +0000 (07:23 -0700)]
Merge "Log duration to logcat always."
am:
ea7255933e
Change-Id: I4d4ddd7425beee3a5272c9bb2f652e1ddab042e4
Treehugger Robot [Mon, 11 Mar 2019 14:18:57 +0000 (14:18 +0000)]
Merge "Log duration to logcat always."
Nandana Dutt [Mon, 11 Mar 2019 13:22:10 +0000 (06:22 -0700)]
Merge "dumpstate: move dump_traces to Dumpstate" am:
6644784ead
am:
c21c20c856
Change-Id: If4f430ade061364ffb5624bd5b8af61f9001e78b
Nandana Dutt [Mon, 11 Mar 2019 13:17:56 +0000 (06:17 -0700)]
Merge "dumpstate: move dump_traces to Dumpstate"
am:
6644784ead
Change-Id: I7d3609d6abd6a3021c525cc63244561384a840a6
Treehugger Robot [Mon, 11 Mar 2019 13:10:53 +0000 (13:10 +0000)]
Merge "dumpstate: move dump_traces to Dumpstate"
Nandana Dutt [Mon, 11 Mar 2019 11:00:58 +0000 (11:00 +0000)]
Log duration to logcat always.
Remove TODO and make the logging behavior intentional.
Rename field to make the intent clearer.
BUG:
128270426
Test: took bugreport and verified log lines: adb logcat | grep "Duration was"
Change-Id: I6a9379af9ee6a03587c40c35f3f242d84ddf3bc3
Nandana Dutt [Mon, 11 Mar 2019 09:23:09 +0000 (09:23 +0000)]
dumpstate: move dump_traces to Dumpstate
Prefactoring to handle user consent denial sooner.
BUG:
128270426
Test: adb shell
/data/nativetest64/dumpstate_smoke_test/dumpstate_smoke_test &&
adb shell /data/nativetest64/dumpstate_test/dumpstate_test
Change-Id: Ifbace4391d22901480e41d3125d8a89508ebd52d
The Android Open Source Project [Fri, 8 Mar 2019 23:56:59 +0000 (15:56 -0800)]
DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug:
127812889
Change-Id: I6af64f4b2667eb4c0540b23cec899581620fc352
Steven Moreland [Fri, 8 Mar 2019 23:54:16 +0000 (15:54 -0800)]
Merge changes from topic "
b127336441" am:
9b07b1ab41
am:
b7e98cd863
Change-Id: I97b48b8c50056e4ba69768f08c04758c4e1e8bbd
Steven Moreland [Fri, 8 Mar 2019 23:53:18 +0000 (15:53 -0800)]
libbinder_ndk: define userdata class in headers am:
304f9d37b1
am:
e6c1c6f32f
Change-Id: I8c1847f620614d7cfb48d0fb7b84a4770f657483
Steven Moreland [Fri, 8 Mar 2019 23:40:35 +0000 (15:40 -0800)]
Merge changes from topic "
b127336441"
am:
9b07b1ab41
Change-Id: I104b6cda22b6d1fc0de531c54cf895d254d4daa5
Steven Moreland [Fri, 8 Mar 2019 23:39:15 +0000 (15:39 -0800)]
libbinder_ndk: define userdata class in headers
am:
304f9d37b1
Change-Id: I76291bd2566509d1f39aaaa4e64c881be9985435
Steven Moreland [Fri, 8 Mar 2019 23:06:43 +0000 (23:06 +0000)]
Merge changes from topic "
b127336441"
* changes:
libbinder_ndk: Fix 'isRemote' value for Bn*.
libbinder_ndk: define userdata class in headers
android-build-team Robot [Fri, 8 Mar 2019 18:45:51 +0000 (18:45 +0000)]
Snap for
5240760 from
3ce2b66f92ea8c50005b38595bb1aed4c80135ed to pi-platform-release
Change-Id: I35689fd57b90f25332bd2e7219b3a72f3d386cab
Steven Moreland [Wed, 6 Mar 2019 23:02:23 +0000 (15:02 -0800)]
libbinder_ndk: Fix 'isRemote' value for Bn*.
Bn* is not remote (it's local).
This wasn't noticed before since the AIDL generated method 'associate'
always wrapped a proxy, and since a wrapped Bn object will always have
a null remoteBinder, it would properly show that it was local even
though it was wrapped.
Bug:
127336441
Test: atest android.binder.cts
Change-Id: Ic4d96822a355e88bc8f3dbbc8fa602835653139e
Steven Moreland [Wed, 6 Mar 2019 21:55:49 +0000 (13:55 -0800)]
libbinder_ndk: define userdata class in headers
Rather than auto-generating it for each class.
From 'struct AIBinder' comment:
(process boundary)
|
MyInterface ---> AIBinder_Weak | ProxyForMyInterface
^ . | |
| . | |
| v | v
UserData <--- AIBinder <-|- AIBinder
ICInterfaceData represents 'UserData' here.
Bug:
127336441
Test: atest android.binder.cts
Change-Id: I2ffd7533dd81f06126547e4c82ec7e1e1cb0b0d0
Steven Moreland [Wed, 6 Mar 2019 01:49:45 +0000 (17:49 -0800)]
Merge "libbinder_ndk: support dump" am:
36415570df
am:
937202b72e
Change-Id: I9ba8f88a15f0bae594ee4b818a5e3afb1459be0c
Steven Moreland [Wed, 6 Mar 2019 00:53:57 +0000 (16:53 -0800)]
Merge "libbinder_ndk: support dump"
am:
36415570df
Change-Id: Ice93b194d4990fbd1315b41391bb8f8bcb7f4b55
Steven Moreland [Wed, 6 Mar 2019 00:22:37 +0000 (00:22 +0000)]
Merge "libbinder_ndk: support dump"
Steven Moreland [Tue, 5 Mar 2019 00:47:07 +0000 (16:47 -0800)]
libbinder_ndk: support dump
At the NDK layer:
AIBinder_Class_setOnDump (to implement dump)
AIBinder_dump (to call dump)
At the AIDL layer:
ICInterface::dump(...) to implement and call dump
Bug:
125733384
Test: atest android.binder.cts
Change-Id: I0873ad574bb7a8b9d645c7301fdfa0797e62c834
Jooyung Han [Tue, 5 Mar 2019 02:43:03 +0000 (18:43 -0800)]
Merge "Move PublicFormat from libandroid_runtime to libui" am:
17f57c6ead
am:
6c47c3b982
Change-Id: I9c4ca9b22e050e8fd0f46ff08cdd22a068f8b75c
Jooyung Han [Tue, 5 Mar 2019 02:29:32 +0000 (18:29 -0800)]
Merge "Move PublicFormat from libandroid_runtime to libui"
am:
17f57c6ead
Change-Id: Ib3fe86fb8c1d2d6726bf4e439f8c8c4ca6ea8619
Treehugger Robot [Tue, 5 Mar 2019 02:16:42 +0000 (02:16 +0000)]
Merge "Move PublicFormat from libandroid_runtime to libui"
Greg Kaiser [Tue, 5 Mar 2019 01:13:32 +0000 (17:13 -0800)]
Merge "ip-up-vpn: Fix resource leaks in error cases" am:
a5d85affa9
am:
01ffab06c1
Change-Id: If994d5d43954fb4d87430101c30522f9d100af56
Greg Kaiser [Tue, 5 Mar 2019 01:00:24 +0000 (17:00 -0800)]
Merge "ip-up-vpn: Fix resource leaks in error cases"
am:
a5d85affa9
Change-Id: Id6a1442dd9226b50a392aca2d484afd357bcabd9
Treehugger Robot [Tue, 5 Mar 2019 00:35:12 +0000 (00:35 +0000)]
Merge "ip-up-vpn: Fix resource leaks in error cases"
Greg Kaiser [Mon, 4 Mar 2019 22:00:34 +0000 (14:00 -0800)]
ip-up-vpn: Fix resource leaks in error cases
These leaks aren't really consequential since this is a standalone
command, and these "leaks" are in main(). But by putting in simple
fixes for these, we reduce the noise when using static analysis to
find leaks in Android code.
Test: TreeHugger
Change-Id: I2cbb4585c6c8d59a0eb89a72f17dfc4fbc532249
Nandana Dutt [Mon, 4 Mar 2019 15:12:33 +0000 (07:12 -0800)]
Merge "dumpstate: handle errors gracefully" am:
e953b04799
am:
607ca6029e
Change-Id: I54463c8a6f238eff4a4b713c510c372c85396cd5
Nandana Dutt [Mon, 4 Mar 2019 15:09:26 +0000 (07:09 -0800)]
Merge "dumpstate: handle errors gracefully"
am:
e953b04799
Change-Id: I6d55aa42a196ac53883057800596b0d065ce605c
Treehugger Robot [Mon, 4 Mar 2019 14:58:30 +0000 (14:58 +0000)]
Merge "dumpstate: handle errors gracefully"
Jooyung Han [Mon, 4 Mar 2019 07:28:48 +0000 (16:28 +0900)]
Move PublicFormat from libandroid_runtime to libui
PublicFormat is defined in android_view_Surface.
However this and related functions are also used in libmediandk
which is both NDK and LL-NDK. As a LL-NDK it should run without
libandroid_runtime.
By moving PublicFormat definition and its utility functions
into libui, LL-NDK can use it without cost of libandroid_runtime.
And also PublicFormat will be deprecated(b/
126594675).
This is a part cutting dependency from libmediandk to
libandroid_runtime.
Note: applied clang-format
Bug:
124268753
Test: m -j
Change-Id: I7215dde607b425f7a0d47a6541b83fbe3a0deaf4
Merged-In: I7215dde607b425f7a0d47a6541b83fbe3a0deaf4
Calin Juravle [Sat, 2 Mar 2019 02:53:14 +0000 (18:53 -0800)]
Merge "Ensure we select the right execution binary for all dexopt commands" am:
3e167da916
am:
fefbbd7e13
Change-Id: Iee8b97e5bb8d52d7761d3f7748d9a4473d1fa0f3
Calin Juravle [Sat, 2 Mar 2019 02:49:00 +0000 (18:49 -0800)]
Merge "Ensure we select the right execution binary for all dexopt commands"
am:
3e167da916
Change-Id: I8b32fe8ad5a98e60ca353029cfa6933e59cee315
Calin Juravle [Sat, 2 Mar 2019 02:36:00 +0000 (02:36 +0000)]
Merge "Ensure we select the right execution binary for all dexopt commands"
Calin Juravle [Fri, 1 Mar 2019 04:29:41 +0000 (20:29 -0800)]
Ensure we select the right execution binary for all dexopt commands
Some devices may not have the debug version of the binaries, so even if we
are asked to use them we can't...
Unify the logic which decides what execution binary to use and apply it to
all commands (dex2oat, profman, dexoptanalyzer).
(follow up fixes to
67a14f6584d6108c29b923ce6a77c0ed5cf347dc)
Test: installd tests
Bug:
124009579
Change-Id: Iec439c0ed63e709cdf35b7f718533eafd429b9c2
Jesse Hall [Fri, 1 Mar 2019 21:13:00 +0000 (13:13 -0800)]
Merge "Update fence event path for kernel 4.10+" am:
f3e024a065
am:
480610413d
Change-Id: If72059250746f9c642d9b0174d9cb15b7dcdaf94
Jesse Hall [Fri, 1 Mar 2019 21:07:50 +0000 (13:07 -0800)]
Merge "Update fence event path for kernel 4.10+"
am:
f3e024a065
Change-Id: I885b096a6b30e9281293d088595f0b6e66005ae6
Treehugger Robot [Fri, 1 Mar 2019 20:56:05 +0000 (20:56 +0000)]
Merge "Update fence event path for kernel 4.10+"
Jesse Hall [Tue, 26 Feb 2019 00:24:10 +0000 (16:24 -0800)]
Update fence event path for kernel 4.10+
The sysfs path for controlling dma fence events changed yet again in
Linux 4.10, see kernel commit
f54d1867005c3.
Test: adb shell atrace --list_categories | grep sync
Test: external/chromium-trace/systrace.py sync, check for dma_fence
events in trace.html's event list
Change-Id: I45905cf199d5de3d5679151f19f8aa693adea5e1
Nandana Dutt [Fri, 22 Feb 2019 15:12:35 +0000 (15:12 +0000)]
dumpstate: handle errors gracefully
Return error codes instead of exiting.
Fixes:
123584708
Test: adb shell
/data/nativetest64/dumpstate_smoke_test/dumpstate_smoke_test &&
adb shell /data/nativetest64/dumpstate_test/dumpstate_test
Change-Id: I2b5fcad4e7a7369e02f0c8f5532e0fc69d45480b
Nicolas Geoffray [Tue, 26 Feb 2019 21:09:54 +0000 (13:09 -0800)]
Merge "Use DEX2OATBOOTCLASSPATH in installd." am:
95ea7b751a
am:
0fde25e90d
Change-Id: I6d71f82f41f4341f9866591f978de333bf8092a5
Nicolas Geoffray [Tue, 26 Feb 2019 21:01:35 +0000 (13:01 -0800)]
Merge "Use DEX2OATBOOTCLASSPATH in installd."
am:
95ea7b751a
Change-Id: Iddddc8bbef7feb2188b991d46ef4c3d28d50011c
Nicolas Geoffray [Tue, 26 Feb 2019 20:38:32 +0000 (20:38 +0000)]
Merge "Use DEX2OATBOOTCLASSPATH in installd."
Nicolas Geoffray [Tue, 26 Feb 2019 15:42:46 +0000 (07:42 -0800)]
Merge "Query the enable_apex_image flag from native experiment." am:
2cb4a0538f
am:
15326fb133
Change-Id: I305d96d9d5764a843cb8a070c70c987723b308be
Nicolas Geoffray [Tue, 26 Feb 2019 15:38:26 +0000 (07:38 -0800)]
Merge "Query the enable_apex_image flag from native experiment."
am:
2cb4a0538f
Change-Id: I35770107e30df01ef38c64926eec072b2a76a951
Nicolas Geoffray [Tue, 26 Feb 2019 15:26:17 +0000 (15:26 +0000)]
Merge "Query the enable_apex_image flag from native experiment."
Nicolas Geoffray [Fri, 22 Feb 2019 21:42:45 +0000 (21:42 +0000)]
Use DEX2OATBOOTCLASSPATH in installd.
Bug:
119800099
Bug:
122937705
Test: dexopt_test
Change-Id: Ie31762910a51ddb1211eed6a24456f0a70379d9c
Shafik Nassar [Tue, 26 Feb 2019 11:25:09 +0000 (03:25 -0800)]
Merge "Whitelist the staging directory in installd" am:
99ba118644
am:
3c86bd1dba
Change-Id: I3541435ea245841079e34ea5bb7dc704dd3330df
Shafik Nassar [Tue, 26 Feb 2019 11:15:35 +0000 (03:15 -0800)]
Merge "Whitelist the staging directory in installd"
am:
99ba118644
Change-Id: I5be2f0d4a82e7e352453371a3ca5f8d6e46ab2d3
Shafik Nassar [Tue, 26 Feb 2019 10:59:50 +0000 (10:59 +0000)]
Merge "Whitelist the staging directory in installd"
Xin Li [Tue, 26 Feb 2019 02:54:33 +0000 (18:54 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
am:
d65a2e6283 -s ours
am skip reason: subject contains skip directive
Change-Id: I4c6db4219a673da35e0666c1b51051d93ab38da9
Xin Li [Tue, 26 Feb 2019 00:13:59 +0000 (16:13 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
am:
5f4277821a -s ours
am skip reason: subject contains skip directive
Change-Id: I3d4582885b96c96308856ff969fce86a2b51edc3
Nandana Dutt [Mon, 25 Feb 2019 18:24:58 +0000 (10:24 -0800)]
Merge "Rename IDumpstateListener errorcode" am:
d7d075fbf6
am:
c943242ff9
Change-Id: I2a8b3bf992243d3d5508248127e690e050f925e3
Nandana Dutt [Mon, 25 Feb 2019 18:23:55 +0000 (10:23 -0800)]
Merge "Log duration reporter to logcat" am:
86d900ff2d
am:
46fe8a946d
Change-Id: I787245655aecb9dadc8c868fe63d68a5d147d971
Nikita Ioffe [Mon, 25 Feb 2019 18:22:58 +0000 (10:22 -0800)]
Merge "installd: parameterize user data snapshots with snapshot_id" am:
8a3c8b1a94
am:
bfa5131193
Change-Id: Ic32854f8ae690a7ca745a0513515b7c499f59c05
Narayan Kamath [Mon, 25 Feb 2019 18:21:54 +0000 (10:21 -0800)]
Merge "dumpstate: Fix IO Errors during zip writing." am:
01f59ce0f6
am:
48d93b7298
Change-Id: I503c787c5e24ac2082f387ee2fac319f722cfd94
Nicolas Geoffray [Mon, 25 Feb 2019 13:31:10 +0000 (13:31 +0000)]
Query the enable_apex_image flag from native experiment.
Bug:
119800099
Test: m
Change-Id: Ibcd90840b4342fae14307ef7f30eec96d58a698b
Xin Li [Sat, 23 Feb 2019 00:39:18 +0000 (00:39 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
Nandana Dutt [Fri, 22 Feb 2019 08:54:16 +0000 (00:54 -0800)]
Merge "Rename IDumpstateListener errorcode"
am:
d7d075fbf6
Change-Id: I2d37f696f9236fe36378a56ee5a0937771ce43a1
Nandana Dutt [Fri, 22 Feb 2019 08:43:48 +0000 (08:43 +0000)]
Merge "Rename IDumpstateListener errorcode"
Nandana Dutt [Thu, 21 Feb 2019 19:13:47 +0000 (11:13 -0800)]
Merge "Log duration reporter to logcat"
am:
86d900ff2d
Change-Id: I2ac8e95d3700764b2e98a49bfcd40fe8dbdf4a18
Treehugger Robot [Thu, 21 Feb 2019 19:00:12 +0000 (19:00 +0000)]
Merge "Log duration reporter to logcat"
Nikita Ioffe [Thu, 21 Feb 2019 18:43:03 +0000 (10:43 -0800)]
Merge "installd: parameterize user data snapshots with snapshot_id"
am:
8a3c8b1a94
Change-Id: Id1393797cda2a83ae39c4dd016657b9ad57b451a
Xin Li [Thu, 21 Feb 2019 17:25:01 +0000 (09:25 -0800)]
DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
Bug:
120848293
Change-Id: Icba28487cde3a6e33898450eaf53ee2be58a3dc8
Treehugger Robot [Thu, 21 Feb 2019 16:28:22 +0000 (16:28 +0000)]
Merge "installd: parameterize user data snapshots with snapshot_id"
Nandana Dutt [Thu, 21 Feb 2019 16:10:10 +0000 (16:10 +0000)]
Rename IDumpstateListener errorcode
BUG:
123571915
Test: adb shell /data/nativetest64/dumpstate_smoke_test/dumpstate_smoke_test --gtest_filter=DumpstateBinderTest.*
Change-Id: I5533f3bfed647a4068893b61dee371f5a4678650
OSDN Git Service
