Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,497 Commits 3 Branches 0 Tags
efa38cd36101d7469e8ed4db03cdebe818bbcfd2
Commit Graph

59868 Commits

Author SHA1 Message Date
Paul Jensen
d9d48cc9c7 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 04:55:52 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
vandwalle
76dc7a1abe am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
* commit 'b897f013b558596964e33b39c0e9678998c281dc':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:25:00 +00:00
vandwalle
b897f013b5 Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 2014-12-11 03:18:42 +00:00
Dianne Hackborn
0f050ea402 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:05:11 +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
Alan Viverette
7171bf40ec am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '6c42ee470307eee56a21062ad67b67878aa9392d':
  Always call onDateChanged() when the date picker selection changes
 2014-12-10 22:12:04 +00:00
Alan Viverette
6c42ee4703 Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 2014-12-10 22:06:19 +00:00
Alan Viverette
3d517a701c am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '62b780e85ff2fcefd4324c3bfbf49b14963cf58b':
  Avoid creating futures for drawables with no constant state
 2014-12-10 21:59:32 +00:00
Alan Viverette
62b780e85f Avoid creating futures for drawables with no constant state 
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.

Rider: Also fixes elevations again.

BUG: 18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
 2014-12-10 13:52:28 -08:00
Paul Jensen
e0bef71662 Fix several HTTP proxy issues with multinetworking. 
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
   not just the default network.
2. When a process is bound to a particular Network, update the proxy
   system properties to those for the bound Network, and keep them
   updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
 2014-12-10 15:22:12 -05:00
Alan Viverette
e6ec07fc5d Always call onDateChanged() when the date picker selection changes 
BUG: 18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
 2014-12-10 11:24:27 -08:00
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
Geoff Mendal
e1bc1c6c9f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 17:15:50 +00:00
Geoff Mendal
295dc00409 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 17:07:24 +00:00
Geoff Mendal
5b736551cc Import translations. DO NOT MERGE 
Change-Id: I3a7d9612bf4b18c14981c0a9e115fc4d320069d6
Auto-generated-cl: translation import
 2014-12-10 09:03:48 -08: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
Geoff Mendal
7e7646487e Import translations. DO NOT MERGE 
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
 2014-12-10 08:40:30 -08: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
Andre Eisenbach
c91499842f Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 2014-12-10 02:31:33 +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
Eric Laurent
5196dd04a0 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 
automerge: 65bc112

* commit '65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 01:34:33 +00:00
Eric Laurent
65bc1125b4 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 2014-12-10 01:33:09 +00: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
vandwalle
08fe024a47 adjust network switching thresholds 
Bug:18589301

Change-Id: I6f08e4b6cbc642a2de4800dc45b68dafae9c2b61
 2014-12-09 16:20:11 -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
Pavel Zhamaitsiak
bf7b4d9489 am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit 'f996d6b7ffcfa813727ba57a30903d1f9e2666da':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 20:17:26 +00:00
Pavel Zhamaitsiak
f996d6b7ff Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 2014-12-09 20:06:55 +00: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 a2838dfc2c.

Bug: 18630625
Bug: 18659737
Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
 2014-12-09 18:32:07 +00:00