Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,131 Commits 3 Branches 0 Tags
7369cc6145274b03dca40dcff1920f4e995c9dba
Commit Graph

2160 Commits

Author SHA1 Message Date
Dianne Hackborn
460797b398 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea 
automerge: b56e98d

* commit 'b56e98da8b0486485a57803e5ef9e9333a510641':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 10:18:41 +00:00
Dianne Hackborn
b56e98da8b am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
automerge: 0f050ea

* commit '0f050ea40204242387eac8f7f5949ea16c143515':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:10:23 +00:00
Dianne Hackborn
1353df5655 Fix issue #18706195: Improve label names of memory types 
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
 2014-12-10 16:54:13 -08:00
Craig Mautner
d2a4320875 am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803 
* commit '647130baacf4f0caf077b5bf6ce00c5e1a23107b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 21:59:23 +00:00
Craig Mautner
647130baac am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
automerge: 8642803

* commit '864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 19:17:53 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Craig Mautner
73bdf9761b Add put/getBoolean/Array to PersistableBundle 
Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.

Fixes bug 18390436.

Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
 2014-12-09 18:10:20 -08:00
Sebastien Hertz
dde13b3714 am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 23:23:36 +00:00
Mathieu Chartier
5311088a3e am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
  Add more -d dalvik details to dumpsys
 2014-12-09 23:22:38 +00:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57 am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:43:00 +00:00
Dianne Hackborn
9b07ba1990 am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit '0cfdd810ded6f8486a6b0a61044594f58ab5c052':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-09 00:59:01 +00:00
Mathieu Chartier
25c5e2b12d Add more -d dalvik details to dumpsys 
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
 2014-12-08 16:38:20 -08:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
Dianne Hackborn
1e01d16982 Fix issue #17323751: Additional items in aggregated battery stats 
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
 2014-12-05 13:54:24 -08:00
Kweku Adams
9b489990fe am 51de927f: am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit '51de927f5ae9b754c4b3927eb8c109ee4dfc602d':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:45:29 +00:00
Kweku Adams
51de927f5a am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:40:04 +00:00
Kweku Adams
d537987b17 Changing AUDIO_TURNED_ON constant. 
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
 2014-12-02 19:18:13 +00:00
Mike Lockwood
6e8fea14cc Merge "ParcelFileDescriptor: add support for non-stream socket pairs." 2014-12-01 21:17:36 +00:00
Mike Lockwood
ced0c25a40 ParcelFileDescriptor: add support for non-stream socket pairs. 
For example, we can use this to create SOCK_SEQPACKET socket pairs.

Change-Id: Ief5c1dab3cbbe40a756d37e77968b41511297bec
 2014-12-01 12:36:11 -08:00
Jeff Sharkey
2a3ca185bf am 45207128: am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '45207128c5c4f0d1f106af8561bdd156546b0aad':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:07:19 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
Narayan Kamath
d198c3269a am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '53651b9982f53236b767d766e85ec0ce3acc6f0f':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:37:59 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Jeff Sharkey
0cce5355b4 Sanitize display names, keep extensions intact. 
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames.  This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type.  Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
 2014-12-01 09:38:49 -08:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev 
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
 2014-11-27 09:57:35 +00:00
Alan Viverette
a033bb9c73 am ed79856d: am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit 'ed79856db292044a15fe7d3c3227fb9ec808f070':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 19:41:43 +00:00
Alan Viverette
ed79856db2 am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 18:41:35 +00:00
Narayan Kamath
7377998dac resolved conflicts for merge of a42f7c1d to lmp-sprout-dev 
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
 2014-11-26 10:39:08 +00:00
Christopher Tate
7265abe77a Be increasingly aggressive about fstrim if it isn't being run 
The current heuristics depend on devices being alive at midnight+ in
order to run periodic background fstrim operations.  This unfortunately
means that people who routinely turn their devices off overnight wind
up with their devices *never* running fstrim, and this causes major
performance and disk-life problems.

We now backstop this very-friendly schedule with an increasingly
aggressive one.  If the device goes a defined time without a background
fstrim, we then force the fstrim at the next reboot.  Once the
device hits the midnight+ idle fstrim request time, then we already
aggressively attempt to fstrim at the first available moment
thereafter, even if it's days/weeks later without a reboot.

'Available' here means charging + device idle.  If the device never
becomes idle then we can't do much without rendering an in-use device
inoperable for some number of minutes -- but we have no evidence of
devices ever failing to run fstrim due to this usage pattern.

A new Settings.Global element (type 'long', called
"fstrim_mandatory_interval") is the source of the backstop time.  If
this element is zero or negative, no mandatory boot-time fstrim will
ever be performed.  If the element is not supplied on a given device,
the default backstop is 3 days.

Adds a new string to display in the upgrading dialog when doing
the fstrim.  Note it is too late for this to be localized, but since
this operation can take a long time it is probably better to have
it show *something* even if not localized, rather than just sit there.

Bug 18486922

Change-Id: I5b265ca0a65570fb8931251aa1ac37b530635a2c
 2014-11-25 16:35:06 -08:00
Alan Viverette
b6e0cb97b7 Load SPEAK_PASSWORD from currently active user rather than self 
Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
 2014-11-25 16:08:03 -08:00
Jeff Brown
fd72097736 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c9041cf837cda13c749b148661d18c3fab0fbd6':
  Support keeping activities resumed while dozing.
 2014-11-21 23:13:49 +00:00
Jeff Brown
4c9041cf83 am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1ac13e0212a770c918d32e6c645682466113632c':
  Support keeping activities resumed while dozing.
 2014-11-21 21:59:47 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Jeff Brown
fbe96706bb Support keeping activities resumed while dozing. 
If the lock screen is not shown, then let activities keep running
while dozing.  This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
 2014-11-20 16:49:18 -08:00
Nicolas Prevot
97166e0790 am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '9b07760dbcc19f47b9ee02081b26a9bbc2a40157':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:08:38 +00:00
Nicolas Prevot
9b07760dbc am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:01:51 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Dianne Hackborn
47acc8f535 am dde2ecc1: am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev 
* commit 'dde2ecc118a56cd4100a29a1dd1c1697b6f56353':
  Add time estimates to batterystats dump.
 2014-11-18 20:22:20 +00:00
Dianne Hackborn
dde2ecc118 am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev 
* commit '7ff92f420e0f32149bcb80698db6108d9e5aaa53':
  Add time estimates to batterystats dump.
 2014-11-18 18:51:50 +00:00
Dianne Hackborn
ad6a99b32a Add time estimates to batterystats dump. 
Also fix some java docs.

Change-Id: Ie705f236db6f06e34fa5581c20852e5c8f7c2c17
 2014-11-18 10:41:09 -08:00
Nicolas Prevot
34b6e35ba6 Fix javadoc in UserManager mentioning application restrictions. 
The java doc of UserManager.KEY_RESTRICTIONS_PENDING contains mistakes.

BUG: 18414603
Change-Id: I9584dad545dcbef1eb2ee0e4f5df117486435e8a
 2014-11-18 14:37:58 +00:00
Jeff Sharkey
4ae37f9052 am 9f722068: am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit '9f722068483239516d0d31841d1deb189d01b5c1':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:44:28 +00:00
Jeff Sharkey
9f72206848 am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit 'ecfd372ae4fc69c10de83c6499c0c0e4379debc8':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:39:16 +00:00
Jeff Sharkey
9c76a7b3e8 Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* changes:
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:28:54 +00:00
Jeff Brown
43dc963a43 am eadefb25: am bba231d7: Explicitly bind AsyncTask to main looper. automerge: dfe7d21 
* commit 'eadefb255a2bda602ccc043531a231413e8ea839':
  Explicitly bind AsyncTask to main looper.
 2014-11-15 03:09:44 +00:00
Jeff Brown
eadefb255a am bba231d7: Explicitly bind AsyncTask to main looper. 
automerge: dfe7d21

* commit 'dfe7d2193cd36099d4395bdee8458c53bf5f1124':
  Explicitly bind AsyncTask to main looper.
 2014-11-15 02:47:56 +00:00
Jeff Brown
bba231d7a6 Explicitly bind AsyncTask to main looper. 
It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable.  In particular, this resulted in occasional system
server crashes.

Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
 2014-11-14 17:22:31 -08:00