drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,410 Commits 1 Branch 0 Tags
Commit Graph

45615 Commits

Author SHA1 Message Date
Dianne Hackborn
7557ec128f am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 17:29:35 +00:00
Dianne Hackborn
6bdbae07cf Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 2014-12-10 17:23:07 +00:00
Craig Mautner
864280369c am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 17:02:10 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Erik Kline
56d2e8fb7b am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Patrick Tjin
6aa6733cf8 am e3703050: Add recovery kmsg to dropbox 
* commit 'e37030505ee3d461508611e1a291aff7b9e82a43':
  Add recovery kmsg to dropbox
 2014-12-10 05:23:50 +00:00
Patrick Tjin
e37030505e Add recovery kmsg to dropbox 
Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
 2014-12-10 05:16:33 +00:00
Dianne Hackborn
80b1c5608e Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... 
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
 2014-12-09 20:22:08 -08:00
Andre Eisenbach
e8323934c7 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 02:36:10 +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
Andre Eisenbach
0fd06a19bd Prevent NullPointerException in getStringValue if no value is set 
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
 2014-12-09 16:42:14 -08:00
John Reck
fe11126d23 am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
  Teach AssetAtlas about more drawables
 2014-12-09 23:18:08 +00:00
Ruben Brunk
6d9826546d Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 
automerge: 3ef5033

* commit '3ef5033cdacbc44702d0b6ba687e81383348e2fd':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:13:06 +00:00
John Reck
4f1942d999 Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
John Reck
dad7d84c04 Teach AssetAtlas about more drawables 
Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
 2014-12-09 14:18:33 -08:00
Elliott Hughes
a04cd35da0 am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
  Fix typo.
 2014-12-09 22:09:25 +00:00
John Reck
7d74cb6c61 am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '14c436897ca56800a3758008f0631c559a898967':
  Fix issue with RNA destruction mid-animation
 2014-12-09 22:08:42 +00:00
Elliott Hughes
0aac16bbf1 am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
  Fix typo.
 2014-12-09 21:34:06 +00:00
John Reck
14c436897c Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 2014-12-09 20:37:17 +00:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation 
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
 2014-12-09 12:35:12 -08:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. 
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
 2014-12-09 11:56:22 -08:00
Elliott Hughes
b034de7eef am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.
 2014-12-09 19:30:26 +00:00
Elliott Hughes
12f100def9 am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
  Fix typo.
 2014-12-09 19:22:33 +00:00
Adrian Roos
a7065ea363 am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit 'c3642ef5c8582193f26b3875cebd902253709d5e':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 18:52:13 +00:00
Adrian Roos
c3642ef5c8 Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 2014-12-09 18:44:31 +00:00
Adrian Roos
2ae3805efb Revert "Add overscan insets to surface frame dimensions in WallpaperService." 
This reverts commit a2838dfc2c1c49b6638a59e82cd8758624efd660.

Bug: 18630625
Bug: 18659737
Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
 2014-12-09 18:32:07 +00:00
Elliott Hughes
547b0acae1 Fix typo. 
Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8b41559b50b3cbde6a103582f8c95b8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
 2014-12-09 10:31:37 -08:00
Wink Saville
2f5cb84355 am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '15b29ac7faf3b8b7845e6623f68ae7a7391dab78':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 17:58:37 +00:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 01:57:26 +00: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
4ec1bdf52f am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:31:11 +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
Alan Viverette
4b944f3ab8 am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev 
* commit '7781647aa90d7d7a070ecd79e52c2d8a11b59b5c':
  Fix auto-advance regression in radial time picker
 2014-12-09 00:18:40 +00:00
Alan Viverette
7781647aa9 Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev 2014-12-09 00:08:01 +00:00
Jeff Sharkey
2f1e953f8f am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev 
* commit '4df65bf1eb454814954421403da9f8b5fcb82180':
  Direct notification of network interface changes.
 2014-12-09 00:07:37 +00:00
Alan Viverette
32230b2bde am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 
* commit '882a1e89742607a3f1fdaa8f5bbd0eb894fc0150':
  Let host view handle long-press when using drag-to-open
 2014-12-09 00:07:17 +00:00
Alan Viverette
5a8b956fd2 am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev 
* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
  Fix regression, don't NPE if Switch doesn't have a thumb set
 2014-12-09 00:07:12 +00:00
Svet Ganov
7f980d7508 am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 
* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
 2014-12-09 00:07:06 +00:00
Svet Ganov
a91256bc75 am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 
* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
  Clear clicked nodes from the accessibiliy cache.
 2014-12-09 00:07:01 +00:00
Alan Viverette
11a68e1803 Fix auto-advance regression in radial time picker 
If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.

BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16
 2014-12-08 15:54:38 -08:00
Jeff Sharkey
4df65bf1eb Merge "Direct notification of network interface changes." into lmp-mr1-dev 2014-12-08 23:12:46 +00:00
Jeff Sharkey
6973634ce6 Direct notification of network interface changes. 
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes.  For example, when stacked network
interfaces change for a mobile network.  To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
 2014-12-08 14:50:14 -08:00
Alan Viverette
882a1e8974 Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 2014-12-08 21:29:08 +00:00
Alan Viverette
db82c9e00e Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev 2014-12-08 21:29:04 +00:00
Svet Ganov
381a423634 Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 2014-12-08 21:28:19 +00:00
Svet Ganov
e232d4a6aa Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 2014-12-08 21:08:36 +00:00