Commit Graph

2775 Commits

Author SHA1 Message Date
Ryo Hashimoto
a316536528 Merge "Use the proper variant of String#substring to report broken strict mode stacks" 2015-09-24 06:22:00 +00:00
Steve McKay
b0a3cc16f8 Merge "Merge BROWSE and BROWSE_ALL actions." 2015-09-23 22:41:49 +00:00
Steve McKay
83df8c072d Merge BROWSE and BROWSE_ALL actions.
Open Files app when exploring from settings.
Force visibility of file size in this mode.
Don't hide empty media providers.

Bug: 24136618, 24140864
Change-Id: I6f238586725f9b6255812e3082bb8d8655219a7d
2015-09-23 12:25:13 -07:00
Xiaohui Chen
e4de5a0d3b Cleanup OWNER references.
Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595
2015-09-23 18:50:11 +00:00
Adam Lesinski
36743412ac am 4092eeb7: am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '4092eeb7f7b079a87c4583c713c0e6d2e208b3c4':
  BatteryStats: Better big-little CPU accounting
2015-09-18 21:08:52 +00:00
Adam Lesinski
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Tim Kilbourn
e13fb40ecb resolved conflicts for 0816319a to master
Change-Id: Ie89ccd479a2eccc95839c162a9b7367349d3886f
2015-09-17 12:50:34 -07:00
Ryo Hashimoto
b4982b20cd Use the proper variant of String#substring to report broken strict mode stacks
substring(int start) returns everything after |start|.
To get the front part, substring(int start, int end) should be used.

Change-Id: I4dfde175f607091b48f90afe92ef3b957ffd1c6b
2015-09-17 15:53:55 +09:00
Tim Murray
0816319a29 am 4816ea0e: am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
* commit '4816ea0e120fd4e2892d372f33c8ca21e4b2efb6':
  Send power hint on fling gestures.
2015-09-17 02:51:39 +00:00
Tim Murray
a02f98239e am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
  Send power hint on fling gestures.
2015-09-17 02:33:35 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
2015-09-17 00:18:13 +00:00
Xiaohui Chen
eecb98197c Refactor UserHandle.java
Remove the "final" keyword on methods, since the class is already
"final".

Change-Id: Ided5813d8a5417c492fd2bf73f9d8018140e5594
2015-09-16 18:07:19 +00:00
Xiaohui Chen
7c69636c9a Cleanup USER_OWNER in various services
Bug: 19913735
Change-Id: I980370bab18e1b9ccf4043eed2b9fd721a940f72
2015-09-16 09:56:14 -07:00
Christopher Tate
b911676209 Avoid parceling redundant ApplicationInfo objects within PackageInfo
Two benefits:

  1) marshaling one flattened ApplicationInfo as part of a PackageInfo parcel
     rather than one per included ComponentInfo; and

  2) producing one ApplicationInfo at unmarshaling time and sharing the
     reference to it among all included ComponentInfo instances, rather
     than the previous implementation that generated a separate
     ApplicationInfo instance for each ComponentInfo.

In some cases there can be many hundreds of ComponentInfo objects embedded
in a single PackageInfo, so coalescing duplicates is a significant win
for both payload size and object pressure.

Bug 19519502
Bug 20453802

Change-Id: Ib888810dad4471084fab9ead1ebb5e0b932905f1
2015-09-10 14:04:01 -07:00
Adam Lesinski
6832f39416 BatteryStats: Better big-little CPU accounting
Generalize cpu clusters so we can measure frequency
and power usage across heterogeneous cpu clusters.

This also brings back reading of cpu-times for power calculation.

Bug:22773176
Change-Id: I9c794ae9756c782c0e971c7f5fcebbe70374b269
2015-09-09 17:07:54 -07:00
Nick Armstrong-Crews
9fb0b5b12c am 13d2fa50: am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '13d2fa50b0815c63d2d289c27d8edacf1ace01eb':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-08 05:38:30 +00:00
Nick Armstrong-Crews
13d2fa50b0 am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-08 05:28:51 +00:00
Nick Armstrong-Crews
dc6aa5fc53 am d70377b5: am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit 'd70377b537450d03d5cdc2efb15977d48e5cfebd':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
2015-09-08 04:48:30 +00:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
2015-09-07 21:46:50 -07:00
Nick Armstrong-Crews
d70377b537 am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
2015-09-08 04:43:38 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
This reverts commit 677adf1e66.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
2015-09-08 04:25:01 +00:00
Nick Armstrong-Crews
e097d341a4 am 7f37402d: am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '7f37402d8c5667f72c1ef02a20112d49d7a149b8':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-04 18:35:23 +00:00
Nick Armstrong-Crews
7f37402d8c am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-04 18:22:54 +00:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
2015-09-04 10:20:22 -07:00
Yasuhiro Matsuda
6d444185e5 resolved conflicts for merge of fcf9ab5a to master
Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
2015-09-03 00:12:30 +09:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Adam Lesinski
54c070ef14 am f7ce28fa: am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit 'f7ce28fad5d76267a9e69a05f6a2147c6baae827':
  BatteryStats: Start using cpu power from kernel
2015-09-01 16:07:56 +00:00
Adam Lesinski
f7ce28fad5 am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
  BatteryStats: Start using cpu power from kernel
2015-08-31 19:33:24 +00:00
Adam Lesinski
da43a3aaca Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 2015-08-31 19:04:46 +00:00
Fyodor Kupolov
3f1099b062 Merge "Non-system users can now have restricted profiles" 2015-08-28 21:44:54 +00:00
Ashish Sharma
56d4ce51c2 am b804f413: am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit 'b804f4134a21989c94ead728b6d36f93a647ce36':
  BatteryStats: Bump checkin version
2015-08-28 00:09:24 +00:00
Ashish Sharma
b804f4134a am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit 'fec26a37a15dc406ae6a3aee67059cb93ef2ae5a':
  BatteryStats: Bump checkin version
2015-08-27 23:55:47 +00:00
Ashish Sharma
ffa3d0408f am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit '3883e72aeda7dcc5f76eba7ad2e95ad2cb041687':
  BatteryStats: Bump checkin version
2015-08-27 23:28:22 +00:00
Fyodor Kupolov
06a484adb9 Non-system users can now have restricted profiles
In the non split system user, only USER_OWNER is allowed to have restricted
profiles. This is now changed in split user mode, where multiple secondary
users can have restricted profiles.

Added UserInfo.restrictedProfileGroupId field, which defines parent/child
relationship between secondary users and linked restricted profiles. Adjusted
shared accounts handling logic to not assume that USER_OWNER is the only owner.

Bug: 23191995
Change-Id: I5f3fc2aa4f229103d6e75ec2c3dfce866b8007de
2015-08-27 15:38:29 -07:00
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server.
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
Adam Lesinski
ab7672d45a BatteryStats: Start using cpu power from kernel
This allows us to stop using approximate methods of attributing
cpu frequency time across apps and to use a more precise kernel
method that is aware of the time spent by a process on a given core
at a given frequency.

Bug:22773176
Change-Id: I3c34365fa8c73204f178a5610423901b13453d06
2015-08-21 16:46:14 -07:00
Adam Lesinski
bb5ac7976d BatteryStats: Bump checkin version
Bug:23391894
Change-Id: I2af980531e07b106cc560c877fa128bbd9c2f18e
2015-08-20 16:44:37 -07:00
Nicolas Prévot
be8b98b939 Merge "Allow non-owner users to have managed profiles." 2015-08-20 14:48:18 +00:00
Nicolas Prevot
b818681dca Allow non-owner users to have managed profiles.
In the split system user model:
The only users that are not allowed to have managed profiles are:
- purely system user (user 0)
- guest users
- restricted profiles
- managed profiles

In the non-split system user model, the behavior does not change:
only the primary user can have managed profiles.

BUG:22956426
Change-Id: If908c30f110fd3e740770174f050c9b6cf87ce1b
2015-08-20 14:15:19 +01:00
Jeff Sharkey
36d4aaeb6e am 39c49625: am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit '39c4962580a52d5ca07f3576009564dddc8f4624':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:59:19 +00:00
Jeff Sharkey
39c4962580 am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit 'e6983e877888dd51abe090b75fa568a64e9fc16e':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:57:52 +00:00
Jeff Sharkey
bbb5717dee am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:33:59 +00:00
Jeff Sharkey
746aee22e8 am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:33:46 +00:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume.
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
2015-08-19 14:16:05 -07:00
Tao Bao
53c217f6c4 am efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
* commit 'efb71f442c6dbdb75113d29df49106217f22cea3':
  Recursively delete directories in handleAftermath().
2015-08-18 22:46:26 +00:00
Tao Bao
efb71f442c am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
2015-08-18 22:41:34 +00:00