Commit Graph

3438 Commits

Author SHA1 Message Date
Dianne Hackborn
c0359bf7d4 Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into nyc-dev am: 47cfac6803 am: 403e103eb2
am: e022330079

Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8
2016-06-17 18:26:54 +00:00
Dianne Hackborn
e022330079 Merge \\"Fix issue #29371078: Foreground jobs should not count...\\" into nyc-dev am: 47cfac6803
am: 403e103eb2

Change-Id: Ief9539ea61813129a9aa2f122178e084ebd5a010
2016-06-16 18:46:43 +00:00
Dianne Hackborn
47cfac6803 Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev 2016-06-16 18:39:03 +00:00
Amith Yamasani
274ae72b47 Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e am: bf1301f542
am: 80027e9d93

Change-Id: I9f6040fb97c55aa5e01d00d5221a2c678227dab2
2016-06-16 00:38:28 +00:00
Dianne Hackborn
7ab4025474 Fix issue #29371078: Foreground jobs should not count...
...as active for idle maintenance

Nor jobs of whitelisted apps.

Now they don't.

Also remove the no longer used "active download" tracking code.

Change-Id: I553197801f6eabaf15716f3201dd65257a0d4e94
2016-06-15 17:30:24 -07:00
Amith Yamasani
80027e9d93 Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
am: bf1301f542

Change-Id: Ie4250ddaa0175ff25a85abdbaa59a31b61003752
2016-06-16 00:28:45 +00:00
Amith Yamasani
4f2b1b455e Merge "More thorough cleansing of expired users" into nyc-dev 2016-06-16 00:14:59 +00:00
Tianjie Xu
f3d0a4c63b Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am: dfa654edfe am: 5b767d1218
am: a92b4737c6

Change-Id: I89897592b5425a3601afa47813c6d109c4d85cd9
2016-06-15 23:03:40 +00:00
Tianjie Xu
a92b4737c6 Merge \\"Fix a naming typo for source_build\\" into nyc-dev am: dfa654edfe
am: 5b767d1218

Change-Id: Iba0740a38e7f9fd97175542ee5255548470b510c
2016-06-15 21:04:04 +00:00
Tianjie Xu
5fabe69fc8 Fix a naming typo for source_build
When parsing the last_install, the variable name is supposed to be
*source_build* instead of *source_version*.

Bug: 28658632
Change-Id: I1e0ed7150e04885f904b6a3efa18bd5cfe17cc96
2016-06-15 12:34:04 -07:00
Amith Yamasani
d04aaa323c More thorough cleansing of expired users
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.

Mark the users' system folders with the correct
serial number for later verification.

AccountManager shouldn't be querying accounts of
partially created/destroyed users.

Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673
2016-06-15 11:32:16 -07:00
Tomasz Mikolajewski
eacd7b9d5c Merge \\\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\\" into nyc-dev am: ac3fe8fffe am: be6e44cdfa
am: 55ab54e33d

Change-Id: Ib073f974518fd01850c9a4be14fe6987658cf1d3
2016-06-14 04:39:25 +00:00
Tomasz Mikolajewski
55ab54e33d Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am: ac3fe8fffe
am: be6e44cdfa

Change-Id: I0dc45cd8cb5c3e824edf56b4229c7dd752f77371
2016-06-14 04:34:50 +00:00
Tomasz Mikolajewski
ac3fe8fffe Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev 2016-06-14 04:15:26 +00:00
Tao Bao
3fec7a80fb Merge \\"Add RecoverySystem.rebootWipeAb() system API.\\" into nyc-mr1-dev am: 9aa66d57c6
am: 20f5cd8d9e

Change-Id: Icf1be48feace06ad193a95f70df39ae979036306
2016-06-13 16:54:50 +00:00
Tao Bao
9aa66d57c6 Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Adam Lesinski
03c3edabaa Merge \\\"BatteryStats: Fix read/write parcel order\\\" into nyc-dev am: e8a442ccd6 am: 860e09ddce
am: e9fdfb6334

Change-Id: I5cdf50d4c89fd135571d97ab3c4072a6b56bc76c
2016-06-10 22:52:19 +00:00
Adam Lesinski
860e09ddce Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
2016-06-10 22:43:45 +00:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Tianjie Xu
5563e82911 Merge \\\"Collect statistics of source build version\\\" into nyc-dev am: 8872a604b9 am: 3287c5f380
am: 0578d40bca

Change-Id: I9cb43b1851448badb4d46ae5be40627dc6034790
2016-06-10 17:37:28 +00:00
Tianjie Xu
0578d40bca Merge \\"Collect statistics of source build version\\" into nyc-dev am: 8872a604b9
am: 3287c5f380

Change-Id: I830db9c215867f5943dce75bd09583742916ae6b
2016-06-10 17:27:06 +00:00
Tianjie Xu
9331178a6d Merge \"Collect statistics of source build version\" into nyc-dev
am: 8872a604b9

Change-Id: Ic920aced4f17c31a09bea55480f92252f20d728d
2016-06-10 17:23:25 +00:00
Tianjie Xu
8872a604b9 Merge "Collect statistics of source build version" into nyc-dev 2016-06-10 17:13:54 +00:00
Adam Lesinski
ea4a9168ac Merge \\\"BatteryStats: Record fine grained battery discharge\\\" into nyc-dev am: 094c40b2cc am: ae903e100f
am: 334d6f35b5

Change-Id: I791fbb20a02713b728314960fffd6e6392854b94
2016-06-10 02:29:26 +00:00
Adam Lesinski
334d6f35b5 Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc
am: ae903e100f

Change-Id: Iaff2fa30e7dea1a8c81c9ae63ef4bdaa98d4f901
2016-06-10 02:24:53 +00:00
Adam Lesinski
d499d79b07 Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
2016-06-10 02:21:54 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
54c05c0001 Merge \\\"BatteryStats: Bump checkin format version to 18\\\" into nyc-dev am: d75bc225ac am: 21b6b2a2d1
am: aa461cb7d2

Change-Id: I5ca744cf27227a84b5b960d221254372391000a8
2016-06-10 01:13:21 +00:00
Adam Lesinski
aa461cb7d2 Merge \\"BatteryStats: Bump checkin format version to 18\\" into nyc-dev am: d75bc225ac
am: 21b6b2a2d1

Change-Id: Ia706ba868997bb55b4a26db88efa3d126001de48
2016-06-10 01:08:06 +00:00
Adam Lesinski
69a983dfec Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am: d75bc225ac

Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89
2016-06-10 01:05:03 +00:00
Adam Lesinski
b55d741c9a BatteryStats: Bump checkin format version to 18
Bug:28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
2016-06-09 17:46:19 -07:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Tao Bao
1327a97a07 Add RecoverySystem.rebootWipeAb() system API.
It reboots into recovery and securely wipes an A/B device.

Bug: 27253717
Bug: 29159185
Change-Id: I8252894db5c1df48bc4a8728b7f0e0f18aebc44c
2016-06-09 16:57:54 -07:00
Tianjie Xu
c1ff246f1a Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/1121141

Bug: 28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
2016-06-09 16:00:11 -07:00
Tianjie Xu
ed18ad5ea2 Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: ebfa28ccf8
am: d889a0a753

Change-Id: I5ff1d2beda2e36d1d983f893d64672a95f4c2990
2016-06-08 18:24:25 +00:00
Tianjie Xu
ebfa28ccf8 Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am: 00681d0e78

Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
2016-06-08 18:04:32 +00:00
Bart Sears
7d462b987f Fix the build
Remove duplicate lines (most likely added by auto-merger).

Change-Id: Ib0d90012a40e83f7b9a1fd0001dfeb6f3b56ff1a
2016-06-08 00:44:47 -07:00
Felipe Leme
61da879b9c Merge \\"Added a getPrimaryStorageSize() method.\\" into nyc-mr1-dev am: ba3676460a
am: 02e2d72d55

Change-Id: I71a1554683697b5b6dde0c47bc2a4464b56b691b
2016-06-08 01:31:14 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Tianjie Xu
a2fe5517bc Change unit of I/O statistics to MiB
I/O in bytes are too large and it may cause overflow. Moreover, data with
large numbers are grouped in the same bucket of the histogram. This adds
difficulty to the analysis. Changing unit of I/O to MiB so that we can
have a better data distribution.

Bug: 28658632
Change-Id: Id9913d71e62b36ce5d5d2e57676953f4dbd0c7c9
2016-06-07 17:54:48 -07:00
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method.
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
2016-06-07 16:42:35 -07:00
Esteban Talavera
8ceec9a1fb Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3 am: cc12064670
am: 9bf7bd1728

* commit '9bf7bd17284152d28458530f6d58f5233c8a3d2b':
  Fix getApplicationRestrictions documentation

Change-Id: Ib86f9b8a02641426aa80a35d55b26972d66a7b7f
2016-06-07 18:08:48 +00:00
Esteban Talavera
cc12064670 Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
2016-06-07 17:59:01 +00:00
Esteban Talavera
953fe48329 Fix getApplicationRestrictions documentation
The method never returns null, only empty bundle

Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
2016-06-07 17:21:49 +01:00
Benjamin Franz
042dd1cee6 Merge "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c
am: 8f79bc6c77

* commit '8f79bc6c7799e2edf3bc13cb82c0972ceeb5edab':
  Add an intent extra to force master clear

Change-Id: I4af0022ec5834d2669321d5c9c76956539c8ead7
2016-06-01 21:08:13 +00:00
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Benjamin Franz
f9d5e6a3db Add an intent extra to force master clear
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.

Bug: 28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
2016-06-01 15:45:59 +01:00
Wei Wang
ac02eee133 Merge "Trigger power hints for activity launch" into nyc-mr1-dev am: 2ab4ac3835
am: 3f1fa8f432

* commit '3f1fa8f43219634c1deb8420d962b0f43c35ccb5':
  Trigger power hints for activity launch

Change-Id: I57075b28d232b61f67e89a16f48c5ac7efeea05d
2016-06-01 03:21:56 +00:00
Wei Wang
2ab4ac3835 Merge "Trigger power hints for activity launch" into nyc-mr1-dev 2016-06-01 03:06:38 +00:00