OSDN Git Service
Calin Juravle [Thu, 2 Nov 2017 18:56:22 +0000 (18:56 +0000)]
Merge "Handle configuration splits when creating the class loader context" am:
88946d4cf2 am:
ee41710ef5 -s ours
am:
d5b968c75b -s ours
Change-Id: Ia7a6bdc5aaaa256fb638e722d1448306a0dc9479
Android Build Merger (Role) [Thu, 2 Nov 2017 18:46:15 +0000 (18:46 +0000)]
Merge "Merge "Ensure dexopt is executed only with consistent package data" am:
1ad0304e7d am:
1c6eeaec1b -s ours am:
eb68bfac36 -s ours"
Calin Juravle [Thu, 2 Nov 2017 18:44:34 +0000 (18:44 +0000)]
Merge "Handle configuration splits when creating the class loader context" am:
88946d4cf2
am:
ee41710ef5 -s ours
Change-Id: I3a80cea56b5a310f8c0e9c6eff5586e98fe5df42
Calin Juravle [Thu, 2 Nov 2017 18:44:10 +0000 (18:44 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" am:
1ad0304e7d am:
1c6eeaec1b -s ours
am:
eb68bfac36 -s ours
Change-Id: I60228e1bb6b2a3fbeecb0c423604aaabf5833501
TreeHugger Robot [Thu, 2 Nov 2017 18:43:18 +0000 (18:43 +0000)]
Merge "Add support for minimized mode for right dock side for tablets (1/2)"
Calin Juravle [Thu, 2 Nov 2017 18:34:38 +0000 (18:34 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" am:
1ad0304e7d
am:
1c6eeaec1b -s ours
Change-Id: I506470013e57b288d54eb5bc308eb79c7c224e69
Calin Juravle [Thu, 2 Nov 2017 18:28:41 +0000 (18:28 +0000)]
Merge "Handle configuration splits when creating the class loader context"
am:
88946d4cf2
Change-Id: I1ed3175ef2094979477dca44b5f0bf56eb34d880
Calin Juravle [Thu, 2 Nov 2017 18:24:12 +0000 (18:24 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"
am:
1ad0304e7d
Change-Id: I32a9c3cf57d0726d7959eb331530fab7f79a7619
TreeHugger Robot [Thu, 2 Nov 2017 18:19:37 +0000 (18:19 +0000)]
Merge "Enable Window Dumpsys Section"
Treehugger Robot [Thu, 2 Nov 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Handle configuration splits when creating the class loader context"
Treehugger Robot [Thu, 2 Nov 2017 18:10:42 +0000 (18:10 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"
Yi Jin [Thu, 2 Nov 2017 17:55:40 +0000 (17:55 +0000)]
Merge "Remove the extra mapping of field types in ProtoOutputStream"
TreeHugger Robot [Thu, 2 Nov 2017 17:38:08 +0000 (17:38 +0000)]
Merge "Add metric ACTION_WIFI_AUTO_SIGN_IN"
TreeHugger Robot [Thu, 2 Nov 2017 17:01:06 +0000 (17:01 +0000)]
Merge "Add prep_taieye"
Winson Chung [Thu, 2 Nov 2017 16:29:57 +0000 (16:29 +0000)]
Merge "Fix CTS regression in running tasks"
Calin Juravle [Sat, 2 Sep 2017 00:30:01 +0000 (17:30 -0700)]
Handle configuration splits when creating the class loader context
Configuration splits have no dependencies which can lead to exceptions
when computing their class loader context.
In general, we do not need to compute the class loader context for apks
without code.
This CL addresses the issue by ignoring "code" paths with no actual code.
(cherry picked from commit
da09815e2cd3d3968c66a8d52e620ee07d8204dd)
Bug:
65159159
Test: adb install-multiple config_splits
runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
Merged-In: Ida1eb901eecba4a4266de73022f6ee4659367873
Change-Id: Ida1eb901eecba4a4266de73022f6ee4659367873
Calin Juravle [Fri, 11 Aug 2017 00:23:00 +0000 (17:23 -0700)]
Ensure dexopt is executed only with consistent package data
The main objects bookkeeping packages (PackageParser.Package and its
corresponding ApplicationInfo) may be updated at different times. This
creates a window where the data stored in the ApplicationInfo is out of
date with respect to the data stored in PackageParser.Package.
During install, the two objects are "synced" during doRename which updates
the package code paths.
This CLs moves the dexopt invocation from the install flow after doRename
to ensure that dexopt logic gets a consistent view of the package.
(cherry picked from commit
4c2b9555b7b52359ea14e201d7ec61b8edaf6232)
Bug:
64493351
Test: run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m
CtsAppSecurityHostTestCases
inspect oat files after
adb install-multiple CtsClassloaderSplitApp/CtsClassloaderSplitApp.apk
CtsClassloaderSplitAppFeatureA/CtsClassloaderSplitAppFeatureA.apk
CtsClassloaderSplitAppFeatureB/CtsClassloaderSplitAppFeatureB.apk
Merged-In: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Change-Id: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Wyatt Riley [Thu, 2 Nov 2017 16:08:55 +0000 (16:08 +0000)]
Merge "Move native_init() from ctor to handler"
Péter Visontay [Thu, 2 Nov 2017 12:29:59 +0000 (12:29 +0000)]
Merge "In WindowManager code, wrap Binder.restoreCallingIdentity() in finally{}."
Charles He [Thu, 2 Nov 2017 11:11:26 +0000 (11:11 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()." am:
dfe472ecae am:
c214d506d4
am:
4e701561d3
Change-Id: Ic6130156ebfe79b731b331ccf2dbb487839d831c
Charles He [Thu, 2 Nov 2017 10:58:30 +0000 (10:58 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()." am:
dfe472ecae
am:
c214d506d4
Change-Id: I0760ba5c839af8a9dd4b9161dbbad16eacdb3550
Charles He [Thu, 2 Nov 2017 10:47:31 +0000 (10:47 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."
am:
dfe472ecae
Change-Id: Ic0ea2afd4dfc00234b97a66a9dafd993b35dd803
Charles He [Thu, 2 Nov 2017 10:36:01 +0000 (10:36 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."
Narayan Kamath [Thu, 2 Nov 2017 10:22:20 +0000 (10:22 +0000)]
Merge "SystemServer: Get rid of some unused config.* knobs."
TreeHugger Robot [Thu, 2 Nov 2017 10:11:05 +0000 (10:11 +0000)]
Merge "Adds pulling for network bytes for statsd."
Narayan Kamath [Thu, 2 Nov 2017 09:31:13 +0000 (09:31 +0000)]
Merge "Watchdog: Remove kernel thread dumps (aka Watchdog_N)."
TreeHugger Robot [Thu, 2 Nov 2017 08:26:49 +0000 (08:26 +0000)]
Merge "Fixes LogEvent constructor to use reference."
David Chen [Tue, 17 Oct 2017 23:23:28 +0000 (16:23 -0700)]
Adds pulling for network bytes for statsd.
Adds atoms to collect network bytes transmitted and received via wifi
and mobile data. We need to get the list of correct ifaces from
BatteryStats since NetworkStatsService only tracks the mobile ifaces.
We split the atoms so that we can also capture metrics sliced on
foreground and background since they are available from the kernel.
Also adds an atom for the Kernel Wakelocks.
Test: Manually tested with adb shell cmd stats pull-source after
modifying the StatsPullerManager.cpp
Change-Id: I9467afad799c6d97560e868f8625fefae5c2b5e1
TreeHugger Robot [Thu, 2 Nov 2017 06:06:56 +0000 (06:06 +0000)]
Merge "Log when app move to foreground or background."
TreeHugger Robot [Thu, 2 Nov 2017 05:27:27 +0000 (05:27 +0000)]
Merge "SystemServer: spawn hwbinder threads before BatteryService"
Sunny Goyal [Thu, 2 Nov 2017 04:55:36 +0000 (04:55 +0000)]
Preventing recursive referrence in drawables am:
99b25d2817
am:
ced997ec10
Change-Id: Iab88125b030bfe21aad82a1b287495cb9e3f54a2
Sunny Goyal [Thu, 2 Nov 2017 04:46:07 +0000 (04:46 +0000)]
Preventing recursive referrence in drawables
am:
99b25d2817
Change-Id: I1c23d40e590d6d8bb21f6734a106d0ee217b6672
Yifan Hong [Thu, 2 Nov 2017 03:19:27 +0000 (20:19 -0700)]
SystemServer: spawn hwbinder threads before BatteryService
BatteryService is the first service that uses a hwbinder
call, so we need to spawn the threads for BatteryService to receive
callbacks prior to starting BatteryService.
Test: boot test
Test: manually sleep in SensorDeviceUtils, still boots
Bug:
68765551
Bug:
68217725
Change-Id: Iadd88897d4cf9e0e37af706452c15318115f2149
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
Yifan Hong [Thu, 2 Nov 2017 04:12:09 +0000 (04:12 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies." am:
762f27c6a2 am:
0134fd1577
am:
ddfee6b154
Change-Id: I70c7fb09397cf9b483ed648f1516158c6c431475
Chenjie Yu [Fri, 27 Oct 2017 22:39:34 +0000 (15:39 -0700)]
Log when app move to foreground or background.
Together with screen state change, we will have appusage info.
Test: manually test on device
Change-Id: Ie9cfe0376cf0d6339be5e8e96f7b360c3f0771d6
Android Build Merger (Role) [Thu, 2 Nov 2017 04:03:49 +0000 (04:03 +0000)]
Merge "Merge "Frameworks: Fix idle-background-job flag" am:
3a16db62ec am:
83419c750f am:
64f4a15a87"
Andreas Gampe [Thu, 2 Nov 2017 04:02:05 +0000 (04:02 +0000)]
Merge "Frameworks: Fix idle-background-job flag" am:
3a16db62ec am:
83419c750f
am:
64f4a15a87
Change-Id: I657a946fd67a44697a51df4b43a60de0cc69c8be
Yifan Hong [Thu, 2 Nov 2017 04:01:07 +0000 (04:01 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies." am:
762f27c6a2
am:
0134fd1577
Change-Id: I9b7b2b45967506469309353eb09c49738805b213
TreeHugger Robot [Thu, 2 Nov 2017 03:59:49 +0000 (03:59 +0000)]
Merge "Disable checking AVB in runtime vintf"
Andreas Gampe [Thu, 2 Nov 2017 03:51:58 +0000 (03:51 +0000)]
Merge "Frameworks: Fix idle-background-job flag" am:
3a16db62ec
am:
83419c750f
Change-Id: I78676a68b624813870bd100577969dbbea66b635
Yifan Hong [Thu, 2 Nov 2017 03:51:08 +0000 (03:51 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."
am:
762f27c6a2
Change-Id: Ia6ebb45cd2e7778483df3c191b3f0d175588e3fc
Andreas Gampe [Thu, 2 Nov 2017 03:41:49 +0000 (03:41 +0000)]
Merge "Frameworks: Fix idle-background-job flag"
am:
3a16db62ec
Change-Id: Ibb9a6213ccc5f48c848228af3a9c2a73e8309133
Treehugger Robot [Thu, 2 Nov 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."
Calin Juravle [Thu, 2 Nov 2017 03:37:06 +0000 (03:37 +0000)]
Merge "Fix dexopt dump" am:
7ef653733f am:
f8ce6d5209 -s ours
am:
7ab7a87fee -s ours
Change-Id: I5840dda76789819ccfab1624055a2ce6c606d701
Treehugger Robot [Thu, 2 Nov 2017 03:31:30 +0000 (03:31 +0000)]
Merge "Frameworks: Fix idle-background-job flag"
Pengquan Meng [Thu, 2 Nov 2017 03:27:00 +0000 (03:27 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId" am:
87a336846e am:
44dc116739
am:
402f64313e
Change-Id: I7fdec39374578ca2c3ca0d34b50d32842cf7efc0
Calin Juravle [Thu, 2 Nov 2017 03:23:37 +0000 (03:23 +0000)]
Merge "Fix dexopt dump" am:
7ef653733f
am:
f8ce6d5209 -s ours
Change-Id: I03624a8bec67a461978ea4ba904be863de8b1c4c
Jordan Liu [Thu, 2 Nov 2017 03:18:52 +0000 (03:18 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID." am:
c173c93c1c am:
7f25f6d720
am:
4d9005226c
Change-Id: I320ea9e61cd369be8d1d2f03b5733a0e1ae00abe
Hall Liu [Thu, 2 Nov 2017 03:08:06 +0000 (03:08 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS" am:
f1167ced38 am:
cca2b5a246
am:
ebe0a4ccf8
Change-Id: I687fbf4a97262ac5570de51924fe18e73658467e
Pengquan Meng [Thu, 2 Nov 2017 03:06:22 +0000 (03:06 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId" am:
87a336846e
am:
44dc116739
Change-Id: I16df51378764d9d62abe8c87c242e5a3a6c3b8ba
Android Build Merger (Role) [Thu, 2 Nov 2017 03:00:28 +0000 (03:00 +0000)]
Merge "Merge "make update-api" am:
07fe9042cf am:
e33d0f594e am:
4a45e0435d"
Mike Ma [Thu, 2 Nov 2017 03:00:07 +0000 (03:00 +0000)]
Merge "Record proto to file in am instrument"
Jordan Liu [Thu, 2 Nov 2017 02:59:59 +0000 (02:59 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID." am:
c173c93c1c
am:
7f25f6d720
Change-Id: Ic46a95c693bfbcfe6884b0cacdb49450b94dcc9a
Tobias Thierer [Thu, 2 Nov 2017 02:57:41 +0000 (02:57 +0000)]
Merge "make update-api" am:
07fe9042cf am:
e33d0f594e
am:
4a45e0435d
Change-Id: I52bc34129a221908dbb3acca5c2e0436f53e7571
Hall Liu [Thu, 2 Nov 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS" am:
f1167ced38
am:
cca2b5a246
Change-Id: I495d10d673d0ac194835446b5c4587bf26246d7e
Tobias Thierer [Thu, 2 Nov 2017 02:47:59 +0000 (02:47 +0000)]
Merge "make update-api" am:
07fe9042cf
am:
e33d0f594e
Change-Id: I32a054929b04211c36394db8029f6bf651209991
Andreas Gampe [Thu, 2 Nov 2017 02:46:33 +0000 (02:46 +0000)]
Merge "resolve merge conflicts of
20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
am:
0c007a721c
Change-Id: I441b2e6713fcc6589b241763d67b2f10e18e4d1c
Calin Juravle [Thu, 2 Nov 2017 02:40:16 +0000 (02:40 +0000)]
Merge "Fix dexopt dump"
am:
7ef653733f
Change-Id: I2373f5f980866548444cb8b9731d79437da12c39
Andreas Gampe [Thu, 2 Nov 2017 02:34:06 +0000 (02:34 +0000)]
Merge "resolve merge conflicts of
20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 2 Nov 2017 02:29:50 +0000 (02:29 +0000)]
Merge "Fix dexopt dump"
TreeHugger Robot [Thu, 2 Nov 2017 02:23:02 +0000 (02:23 +0000)]
Merge "reretry ValueMetric implementation and pulling mechanism"
TreeHugger Robot [Thu, 2 Nov 2017 02:10:46 +0000 (02:10 +0000)]
Merge "Added setFillWindowForwardOnly"
Christine Franks [Thu, 2 Nov 2017 01:52:48 +0000 (01:52 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev am:
58a10a7b12
am:
bf3255b524
Change-Id: Idd6dc17a22f554b5dedc7691d5b79e28cfc06ab7
Daniel Sandler [Thu, 2 Nov 2017 01:41:15 +0000 (01:41 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev am:
c2496f917c
am:
fe46fab361 -s ours
Change-Id: Icb26261e90bf827a59cd1e81945677125b2f84ba
Christine Franks [Thu, 2 Nov 2017 01:39:19 +0000 (01:39 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev
am:
58a10a7b12
Change-Id: I34bc01c71a0a28857d41668c3cae5dc36f56b0d3
Yifan Hong [Wed, 1 Nov 2017 00:32:15 +0000 (17:32 -0700)]
Allow equality checking and hash for HIDL interface proxies.
IFoo.Proxy.equals() -> HidlSupport.equals() ->
IHwInterface.asBinder().equals() -> HwRemoteBinder.equals().
IFoo.Stub.equals() -> default Object.equals()
Notice that IHwInterface.asBinder() returns mRemote(of type
HwRemoteBinder) for proxies and itself (of type HwBinder) for stubs.
If IFoo.Stub.asBinder() had not return "this", its equals()
should also be overridden.
Bug:
68727931
Test: hidl_test_java
Change-Id: I916983d7bc739747145e2ebb6830226310fd4980
Daniel Sandler [Thu, 2 Nov 2017 01:29:56 +0000 (01:29 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev
am:
c2496f917c
Change-Id: If90a63b7adcb61db0e5e33016adf04d8cd3721cf
Bryce Lee [Thu, 2 Nov 2017 01:26:48 +0000 (01:26 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev am:
0be61c662b
am:
fbddd89e93 -s ours
Change-Id: I288d531a951f24fdd1d752cbf1d06cc572be265d
Yi Jin [Tue, 24 Oct 2017 19:30:24 +0000 (12:30 -0700)]
Enable Window Dumpsys Section
Protobuf defines classes, which can have self recursive message
definitions and cause a bug in generating privacy flags.
Solve the problem here. The details is in incident_section_gen/main.cpp.
The logic is a bit complicated to address more than one level of self
recursion proto message definition.
Also solve a bug when PrivacyBuffer strips fields.
Modify PRIVACY_POLICY_LIST to be type Privacy** in order to allow
initialization by a method.
Bug:
68162512
Test: unit tested and on device tests
Change-Id: I1d0b79f6813e5fd66c4cf5823d0fa17efc57bb1d
Pengquan Meng [Thu, 2 Nov 2017 01:21:11 +0000 (01:21 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId"
am:
87a336846e
Change-Id: Id0de42b730ca4941e1436e959604a28296508b03
Bryce Lee [Thu, 2 Nov 2017 01:14:49 +0000 (01:14 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev
am:
0be61c662b
Change-Id: I8db0cda8ce289423b9f63d3dc1b2598e951e1e2d
Christine Franks [Thu, 2 Nov 2017 01:13:21 +0000 (01:13 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev
Pengquan Meng [Thu, 2 Nov 2017 01:11:29 +0000 (01:11 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId"
TreeHugger Robot [Thu, 2 Nov 2017 01:04:25 +0000 (01:04 +0000)]
Merge "Prevent monkey from turning off adb"
Daniel Sandler [Thu, 2 Nov 2017 00:52:55 +0000 (00:52 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev
Bryce Lee [Thu, 2 Nov 2017 00:52:40 +0000 (00:52 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 00:40:48 +0000 (17:40 -0700)]
Fix dexopt dump
Dexopt dump prints the status of primary oat file instead of secondary.
We cannot get the secondary dex file status without an installd call so
this CL just removes the status line.
(cherry picked from commit
cf72222f41f4ce73302274d2e8b4fcc735c3bd00)
Bug:
65843255
Test: adb shell dumpsys package dexopt
Merged-In: I76028704267eed68ba8c51f45ce8b54f403cc255
Change-Id: I76028704267eed68ba8c51f45ce8b54f403cc255
Winson Chung [Thu, 2 Nov 2017 00:09:48 +0000 (17:09 -0700)]
Fix CTS regression in running tasks
Bug:
68773661
Test: android.app.cts.ActivityManagerTest
Test: com.android.server.am.RunningTasksTest
Change-Id: I030e2f85bb0f4c3101a805584cf0748967908508
Fyodor Kupolov [Thu, 2 Nov 2017 00:07:07 +0000 (00:07 +0000)]
Merge "Initial version of compatibility WAL"
Andreas Gampe [Thu, 2 Nov 2017 00:05:53 +0000 (17:05 -0700)]
Frameworks: Fix idle-background-job flag
Correctly pass flag to installd.
Bug:
68025088
Test: m
Test: manual test
Change-Id: Ia5b19b1f1375a3c8b0c8e19b1978dcba29c83470
David Chen [Wed, 1 Nov 2017 23:57:43 +0000 (16:57 -0700)]
Fixes LogEvent constructor to use reference.
Previously when fixing LogEvent missing strings because of pointer
lifetime issues, I had the constructor for LogEvent pass log_msg by
value. This fixes log_msg to pass by reference again so that we avoid
wasting memory.
Test: Checked statsd unit-tests still pass.
Change-Id: I94ac4d1bed19fec19d44e27fe94e07ab30383363
Andreas Gampe [Wed, 1 Nov 2017 23:56:39 +0000 (16:56 -0700)]
resolve merge conflicts of
20d9ae562062 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I73cd9a9198ef5640a6b3dced713fcbb17563dd8b
Jordan Liu [Wed, 1 Nov 2017 23:29:01 +0000 (23:29 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID."
am:
c173c93c1c
Change-Id: Ib9851f91a687fb56ba2488710fa3a580cd3f1e91
Jordan Liu [Wed, 1 Nov 2017 23:20:39 +0000 (23:20 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID."
Hall Liu [Wed, 1 Nov 2017 23:17:05 +0000 (23:17 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS"
am:
f1167ced38
Change-Id: If22e7de55c8ec2f603c4a59f575b65cebf421a93
Tobias Thierer [Wed, 1 Nov 2017 23:01:37 +0000 (23:01 +0000)]
Merge "make update-api"
am:
07fe9042cf
Change-Id: I2562b319cb5d326a6067e20cc6b925c89366e07d
Calin Juravle [Wed, 1 Nov 2017 23:01:24 +0000 (23:01 +0000)]
Merge changes Ibf9e7b9e,I8031590c am:
1eb700a545 am:
f11984f9da -s ours
am:
1b43913b23 -s ours
Change-Id: Ie1e804480fa5e971b2fe59a802abaa15115b2500
Chenjie Yu [Tue, 24 Oct 2017 20:41:59 +0000 (13:41 -0700)]
reretry ValueMetric implementation and pulling mechanism
Note:
This is for value metric. The default operations is sum the diffs.
The test uses kernel wake lock, which also needs dimension by kernel
wake lock name.
The test is a bit cumbersome as it needs StatsCompanionService to do
the alarm, which is not exact alarm.
The internal state of a slice of bucket would look something like this:
4:ipc0000005e_727_android.hardwar
0 0
4:SensorService_wakelock
40 64
4:ipc0000005c_727_android.hardwar
...
Test: manual test on device.
Change-Id: I2ed0ac7d3c5fcba8b7611d46f38a38ffd8bdc92a
Calin Juravle [Wed, 1 Nov 2017 22:52:05 +0000 (22:52 +0000)]
Merge changes Ie8b78c7c,If02081d2 am:
fe177b78d7 am:
a47c4440fd -s ours
am:
23bf5b67e6 -s ours
Change-Id: I74ca3369845db058684a5ecef8cca03073831c20
Calin Juravle [Wed, 1 Nov 2017 22:47:44 +0000 (22:47 +0000)]
Merge changes Ibf9e7b9e,I8031590c am:
1eb700a545
am:
f11984f9da -s ours
Change-Id: Ie7b5b381babaa15f07a73a6b647f7d92e722ca77
Calin Juravle [Wed, 1 Nov 2017 22:42:56 +0000 (22:42 +0000)]
Merge changes I7bd99fc0,I329bc929 am:
deee2e12de am:
71ae6b3aab -s ours
am:
ad0cc34ddd -s ours
Change-Id: I2a017d5eb99446d9834a3941f67d2d2fd234fe30
David Sehr [Wed, 1 Nov 2017 22:42:50 +0000 (22:42 +0000)]
Merge changes from topic "bgdex2oatd_cherry_pick"
am:
e686fabf42
Change-Id: Ib3aa6d92d2a4c5ef0617a57adea62913041d4b75
Calin Juravle [Wed, 1 Nov 2017 22:38:31 +0000 (22:38 +0000)]
Merge changes Ie8b78c7c,If02081d2 am:
fe177b78d7
am:
a47c4440fd -s ours
Change-Id: If37dbec17b0aa7e2443f9547eff63a6740d6fb75
Hall Liu [Wed, 1 Nov 2017 22:35:51 +0000 (22:35 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS"
Calin Juravle [Wed, 1 Nov 2017 22:35:16 +0000 (22:35 +0000)]
Merge changes Ibf9e7b9e,I8031590c
am:
1eb700a545
Change-Id: I3bff20ab08a33f1607ec7b91abab2a77d7a3b22f
Lucas Dupin [Wed, 1 Nov 2017 22:32:29 +0000 (22:32 +0000)]
Merge "Fix slice permissions to allow uri grants"
Calin Juravle [Wed, 1 Nov 2017 22:29:53 +0000 (22:29 +0000)]
Merge changes I7bd99fc0,I329bc929 am:
deee2e12de
am:
71ae6b3aab -s ours
Change-Id: Ia35c56d89cc56f315418da14ab0b19f2839a972e
Calin Juravle [Wed, 1 Nov 2017 22:27:29 +0000 (22:27 +0000)]
Merge changes Ie8b78c7c,If02081d2
am:
fe177b78d7
Change-Id: I2720d1e1433367e9f584451408951dce0b61e0da
Calin Juravle [Wed, 1 Nov 2017 22:20:06 +0000 (22:20 +0000)]
Merge changes I7bd99fc0,I329bc929
am:
deee2e12de
Change-Id: I52905bf3d6971332b216c8b5f18a695a4bbd23c5