OSDN Git Service

android-x86/frameworks-base.git
6 years agoMake CHANGE_APP_IDLE_STATE a system API
Amith Yamasani [Tue, 31 Oct 2017 20:29:00 +0000 (13:29 -0700)]
Make CHANGE_APP_IDLE_STATE a system API

Allows a privileged app to set standby bucket states for apps.

Bug: 63527785
Test: adb shell am set-standby-bucket com.example.foo 0
Change-Id: I069546555e1b370247f8cd45b2f4c32e6abe15ed

6 years agoMerge "Add prep_taieye"
TreeHugger Robot [Thu, 2 Nov 2017 17:01:06 +0000 (17:01 +0000)]
Merge "Add prep_taieye"

6 years agoMerge "Fix CTS regression in running tasks"
Winson Chung [Thu, 2 Nov 2017 16:29:57 +0000 (16:29 +0000)]
Merge "Fix CTS regression in running tasks"

6 years agoMerge "Move native_init() from ctor to handler"
Wyatt Riley [Thu, 2 Nov 2017 16:08:55 +0000 (16:08 +0000)]
Merge "Move native_init() from ctor to handler"

6 years agoMerge "In WindowManager code, wrap Binder.restoreCallingIdentity() in finally{}."
Péter Visontay [Thu, 2 Nov 2017 12:29:59 +0000 (12:29 +0000)]
Merge "In WindowManager code, wrap Binder.restoreCallingIdentity() in finally{}."

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae am:...
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

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
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

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()."
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

6 years agoMerge "TokenWatcher: fix bug in repeated calls to acquire()."
Charles He [Thu, 2 Nov 2017 10:36:01 +0000 (10:36 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."

6 years agoMerge "SystemServer: Get rid of some unused config.* knobs."
Narayan Kamath [Thu, 2 Nov 2017 10:22:20 +0000 (10:22 +0000)]
Merge "SystemServer: Get rid of some unused config.* knobs."

6 years agoMerge "Adds pulling for network bytes for statsd."
TreeHugger Robot [Thu, 2 Nov 2017 10:11:05 +0000 (10:11 +0000)]
Merge "Adds pulling for network bytes for statsd."

6 years agoMerge "Watchdog: Remove kernel thread dumps (aka Watchdog_N)."
Narayan Kamath [Thu, 2 Nov 2017 09:31:13 +0000 (09:31 +0000)]
Merge "Watchdog: Remove kernel thread dumps (aka Watchdog_N)."

6 years agoMerge "Fixes LogEvent constructor to use reference."
TreeHugger Robot [Thu, 2 Nov 2017 08:26:49 +0000 (08:26 +0000)]
Merge "Fixes LogEvent constructor to use reference."

6 years agoAdds pulling for network bytes for statsd.
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

6 years agoMerge "Log when app move to foreground or background."
TreeHugger Robot [Thu, 2 Nov 2017 06:06:56 +0000 (06:06 +0000)]
Merge "Log when app move to foreground or background."

6 years agoMerge "SystemServer: spawn hwbinder threads before BatteryService"
TreeHugger Robot [Thu, 2 Nov 2017 05:27:27 +0000 (05:27 +0000)]
Merge "SystemServer: spawn hwbinder threads before BatteryService"

6 years agoPreventing recursive referrence in drawables am: 99b25d2817
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

6 years agoPreventing recursive referrence in drawables
Sunny Goyal [Thu, 2 Nov 2017 04:46:07 +0000 (04:46 +0000)]
Preventing recursive referrence in drawables
am: 99b25d2817

Change-Id: I1c23d40e590d6d8bb21f6734a106d0ee217b6672

6 years agoSystemServer: spawn hwbinder threads before BatteryService
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

6 years agoPreventing recursive referrence in drawables
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

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies." am: 762f27c6a2...
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

6 years agoLog when app move to foreground or background.
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

6 years agoMerge "Merge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec am: 83419c750f...
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"

6 years agoMerge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec am: 83419c750f
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

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies." am: 762f27c6a2
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

6 years agoMerge "Disable checking AVB in runtime vintf"
TreeHugger Robot [Thu, 2 Nov 2017 03:59:49 +0000 (03:59 +0000)]
Merge "Disable checking AVB in runtime vintf"

6 years agoMerge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec
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

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies."
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

6 years agoMerge "Frameworks: Fix idle-background-job flag"
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

6 years agoMerge "Allow equality checking and hash for HIDL interface proxies."
Treehugger Robot [Thu, 2 Nov 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."

6 years agoMerge "Fix dexopt dump" am: 7ef653733f am: f8ce6d5209 -s ours
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

6 years agoMerge "Frameworks: Fix idle-background-job flag"
Treehugger Robot [Thu, 2 Nov 2017 03:31:30 +0000 (03:31 +0000)]
Merge "Frameworks: Fix idle-background-job flag"

6 years agoMerge "Fix getSimOperator to return mccmnc based on subId" am: 87a336846e am: 44dc116739
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

6 years agoMerge "Fix dexopt dump" am: 7ef653733f
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

6 years agoMerge "Added interface to get the decimal digit from hex ICCID." am: c173c93c1c am...
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

6 years agoMerge "Add @TestApi for EMBMS APIs needed for CTS" am: f1167ced38 am: cca2b5a246
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

6 years agoMerge "Fix getSimOperator to return mccmnc based on subId" am: 87a336846e
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

6 years agoMerge "Merge "make update-api" am: 07fe9042cf am: e33d0f594e am: 4a45e0435d"
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"

6 years agoMerge "Record proto to file in am instrument"
Mike Ma [Thu, 2 Nov 2017 03:00:07 +0000 (03:00 +0000)]
Merge "Record proto to file in am instrument"

6 years agoMerge "Added interface to get the decimal digit from hex ICCID." am: c173c93c1c
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

6 years agoMerge "make update-api" am: 07fe9042cf am: e33d0f594e
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

6 years agoMerge "Add @TestApi for EMBMS APIs needed for CTS" am: f1167ced38
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

6 years agoMerge "make update-api" am: 07fe9042cf
Tobias Thierer [Thu, 2 Nov 2017 02:47:59 +0000 (02:47 +0000)]
Merge "make update-api" am: 07fe9042cf
am: e33d0f594e

Change-Id: I32a054929b04211c36394db8029f6bf651209991

6 years agoMerge "resolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1...
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

6 years agoMerge "Fix dexopt dump"
Calin Juravle [Thu, 2 Nov 2017 02:40:16 +0000 (02:40 +0000)]
Merge "Fix dexopt dump"
am: 7ef653733f

Change-Id: I2373f5f980866548444cb8b9731d79437da12c39

6 years agoMerge "resolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1...
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

6 years agoMerge "Fix dexopt dump"
Treehugger Robot [Thu, 2 Nov 2017 02:29:50 +0000 (02:29 +0000)]
Merge "Fix dexopt dump"

6 years agoMerge "reretry ValueMetric implementation and pulling mechanism"
TreeHugger Robot [Thu, 2 Nov 2017 02:23:02 +0000 (02:23 +0000)]
Merge "reretry ValueMetric implementation and pulling mechanism"

6 years agoMerge "Added setFillWindowForwardOnly"
TreeHugger Robot [Thu, 2 Nov 2017 02:10:46 +0000 (02:10 +0000)]
Merge "Added setFillWindowForwardOnly"

6 years agoMerge "Respect legacy color mode settings" into oc-mr1-dev am: 58a10a7b12
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

6 years agoMerge "Allow dnd access for secondary users" into oc-mr1-dev am: c2496f917c
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

6 years agoMerge "Respect legacy color mode settings" into oc-mr1-dev
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

6 years agoAllow equality checking and hash for HIDL interface proxies.
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

6 years agoMerge "Allow dnd access for secondary users" into oc-mr1-dev
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

6 years agoMerge "DO NOT MERGE Remove orientation restriction to only fullscreen activities...
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

6 years agoMerge "Fix getSimOperator to return mccmnc based on subId"
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

6 years agoMerge "DO NOT MERGE Remove orientation restriction to only fullscreen activities...
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

6 years agoMerge "Respect legacy color mode settings" into oc-mr1-dev
Christine Franks [Thu, 2 Nov 2017 01:13:21 +0000 (01:13 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev

6 years agoMerge "Fix getSimOperator to return mccmnc based on subId"
Pengquan Meng [Thu, 2 Nov 2017 01:11:29 +0000 (01:11 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId"

6 years agoMerge "Prevent monkey from turning off adb"
TreeHugger Robot [Thu, 2 Nov 2017 01:04:25 +0000 (01:04 +0000)]
Merge "Prevent monkey from turning off adb"

6 years agoMerge "Allow dnd access for secondary users" into oc-mr1-dev
Daniel Sandler [Thu, 2 Nov 2017 00:52:55 +0000 (00:52 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev

6 years agoMerge "DO NOT MERGE Remove orientation restriction to only fullscreen activities...
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

6 years agoFix dexopt dump
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

6 years agoFix CTS regression in running tasks
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

6 years agoMerge "Initial version of compatibility WAL"
Fyodor Kupolov [Thu, 2 Nov 2017 00:07:07 +0000 (00:07 +0000)]
Merge "Initial version of compatibility WAL"

6 years agoFrameworks: Fix idle-background-job flag
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

6 years agoFixes LogEvent constructor to use reference.
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

6 years agoresolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp
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

6 years agoMerge "Added interface to get the decimal digit from hex ICCID."
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

6 years agoMerge "Added interface to get the decimal digit from hex ICCID."
Jordan Liu [Wed, 1 Nov 2017 23:20:39 +0000 (23:20 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID."

6 years agoMerge "Add @TestApi for EMBMS APIs needed for CTS"
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

6 years agoMerge "make update-api"
Tobias Thierer [Wed, 1 Nov 2017 23:01:37 +0000 (23:01 +0000)]
Merge "make update-api"
am: 07fe9042cf

Change-Id: I2562b319cb5d326a6067e20cc6b925c89366e07d

6 years agoMerge changes Ibf9e7b9e,I8031590c am: 1eb700a545 am: f11984f9da -s ours
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

6 years agoreretry ValueMetric implementation and pulling mechanism
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

6 years agoMerge changes Ie8b78c7c,If02081d2 am: fe177b78d7 am: a47c4440fd -s ours
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

6 years agoMerge changes Ibf9e7b9e,I8031590c am: 1eb700a545
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

6 years agoMerge changes I7bd99fc0,I329bc929 am: deee2e12de am: 71ae6b3aab -s ours
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

6 years agoMerge changes from topic "bgdex2oatd_cherry_pick"
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

6 years agoMerge changes Ie8b78c7c,If02081d2 am: fe177b78d7
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

6 years agoMerge "Add @TestApi for EMBMS APIs needed for CTS"
Hall Liu [Wed, 1 Nov 2017 22:35:51 +0000 (22:35 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS"

6 years agoMerge changes Ibf9e7b9e,I8031590c
Calin Juravle [Wed, 1 Nov 2017 22:35:16 +0000 (22:35 +0000)]
Merge changes Ibf9e7b9e,I8031590c
am: 1eb700a545

Change-Id: I3bff20ab08a33f1607ec7b91abab2a77d7a3b22f

6 years agoMerge "Fix slice permissions to allow uri grants"
Lucas Dupin [Wed, 1 Nov 2017 22:32:29 +0000 (22:32 +0000)]
Merge "Fix slice permissions to allow uri grants"

6 years agoMerge changes I7bd99fc0,I329bc929 am: deee2e12de
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

6 years agoMerge changes Ie8b78c7c,If02081d2
Calin Juravle [Wed, 1 Nov 2017 22:27:29 +0000 (22:27 +0000)]
Merge changes Ie8b78c7c,If02081d2
am: fe177b78d7

Change-Id: I2720d1e1433367e9f584451408951dce0b61e0da

6 years agoMerge changes I7bd99fc0,I329bc929
Calin Juravle [Wed, 1 Nov 2017 22:20:06 +0000 (22:20 +0000)]
Merge changes I7bd99fc0,I329bc929
am: deee2e12de

Change-Id: I52905bf3d6971332b216c8b5f18a695a4bbd23c5

6 years agoMerge "make update-api"
Treehugger Robot [Wed, 1 Nov 2017 22:18:39 +0000 (22:18 +0000)]
Merge "make update-api"

6 years agoMerge "Fix PixelCopyTest failure in CTS"
TreeHugger Robot [Wed, 1 Nov 2017 22:09:36 +0000 (22:09 +0000)]
Merge "Fix PixelCopyTest failure in CTS"

6 years agoMerge changes from topic "bgdex2oatd_cherry_pick"
Treehugger Robot [Wed, 1 Nov 2017 21:55:02 +0000 (21:55 +0000)]
Merge changes from topic "bgdex2oatd_cherry_pick"

* changes:
  Use dex2oatd when available on debug builds
  Add package use info to dexopt dump

6 years agoMerge changes Ibf9e7b9e,I8031590c
Treehugger Robot [Wed, 1 Nov 2017 21:53:50 +0000 (21:53 +0000)]
Merge changes Ibf9e7b9e,I8031590c

* changes:
  Record usage information per split
  Use PackageUseInfo in DexOptimizer

6 years agoMerge changes Ie8b78c7c,If02081d2
Treehugger Robot [Wed, 1 Nov 2017 21:53:12 +0000 (21:53 +0000)]
Merge changes Ie8b78c7c,If02081d2

* changes:
  Use the class loader context when optimizing secondary dex files
  Add DexClassLoader to the list of supported class loaders

6 years agoMerge changes I7bd99fc0,I329bc929
Treehugger Robot [Wed, 1 Nov 2017 21:52:34 +0000 (21:52 +0000)]
Merge changes I7bd99fc0,I329bc929

* changes:
  Save PackageDexUsage on PMS shutdown
  Record dex files users in the dex-usage list

6 years agoAdd prep_taieye
John Reck [Wed, 1 Nov 2017 21:28:02 +0000 (14:28 -0700)]
Add prep_taieye

Test: ran script
Change-Id: I39a859e6eddea9d81241bbbbb931d1ddf4e14c53

6 years agoMove native_init() from ctor to handler
Wyatt Riley [Tue, 31 Oct 2017 21:36:52 +0000 (14:36 -0700)]
Move native_init() from ctor to handler

Moves potentially slow reponses to native_init() for
GNSS HAL off the main system service startup
thread to the LocationManagerService handler

Bug: 38362097
Bug: 63707763
Test: GNSS still works on device, boot logcat as expected
Change-Id: If3e6735fdcf2b41cb743878154e8c03fa27f725b

6 years agoMerge "[framework] Add check that classpath is up to date to getDexOptNeeded" am...
Calin Juravle [Wed, 1 Nov 2017 21:39:02 +0000 (21:39 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" am: 945b1dc43e am: 8952f058ff
am: b3145221ae  -s ours

Change-Id: Ic6fae72706502b6681b710ddfd35fccd4d0b0b61

6 years agoAdded setFillWindowForwardOnly
Fyodor Kupolov [Fri, 27 Oct 2017 22:03:29 +0000 (15:03 -0700)]
Added setFillWindowForwardOnly

It controls fetching of rows relative to requested position

Test: SQLiteCursorTest
Bug: 62550963
Change-Id: Iab651d8e3d689710b0436650c58dab86b119e296

6 years agoMerge "Display the number of LTE signal bars is based on RSRP only" am: 896dd7cdb7...
Jordan Liu [Wed, 1 Nov 2017 21:30:38 +0000 (21:30 +0000)]
Merge "Display the number of LTE signal bars is based on RSRP only" am: 896dd7cdb7 am: 973005e208
am: ffb55f273b

Change-Id: I9a130303a18bdb239d3fddc31ed57b9a942df166

6 years agoRecord proto to file in am instrument
Mike Ma [Tue, 31 Oct 2017 19:30:42 +0000 (12:30 -0700)]
Record proto to file in am instrument

Add an option -f to record instrumentdata proto produced by am instrument
to a file in addition to printing to stdout. Default path is
/sdcard/instrument-logs/log-yyyyMMdd-hhmmss-SSS.instrumentation_data_proto.
If the file exits, it will be deleted before writing. Path can be changed
via optional <FILE> argument after -f.
If -f and -m are both present, proto will be written to a file and print
to stdout.

Test: build, flash and run:
bit -bi FrameworksCoreTests
adb shell am instrument -w -r -f tmp/tmp.log \
-e class com.android.internal.os.BatteryStatsNoteTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Iabc320c066d5995eee842c26416623eeb3d403f4

6 years agoMerge "Debug: Remove obsolete InstructionCount code." am: f5a8edeaf0 am: 47659c3351
Narayan Kamath [Wed, 1 Nov 2017 21:17:51 +0000 (21:17 +0000)]
Merge "Debug: Remove obsolete InstructionCount code." am: f5a8edeaf0 am: 47659c3351
am: 39343bf215

Change-Id: I79f3b2ec2a2ef449703867dea4dced63ab1b63ad

6 years agoMerge "[framework] Add check that classpath is up to date to getDexOptNeeded" am...
Calin Juravle [Wed, 1 Nov 2017 21:13:56 +0000 (21:13 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" am: 945b1dc43e
am: 8952f058ff

Change-Id: Iad6377ad17a93948ae41b23d7f49669577869669

6 years agoMerge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" am: dc616ab11c...
Narayan Kamath [Wed, 1 Nov 2017 21:10:48 +0000 (21:10 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" am: dc616ab11c am: cfb01b3f3f
am: 7dc51259cd

Change-Id: Ie72e549707b50d2b9b419e6fc2fbc82301ad3805