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

21462 Commits

Author SHA1 Message Date
Brian Carlstrom
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry 
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
 2014-12-16 00:55:20 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Christopher Tate
36ba3e478f am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
  Check which file changed before requesting backup
 2014-12-13 00:59:10 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Amith Yamasani
52d750c5c2 Check which file changed before requesting backup 
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.

Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
 2014-12-13 00:15:45 +00:00
Svet Ganov
26c8895465 am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 20:54:43 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
09687064f4 Fix a NPE in AccessiiblityManagerService. 
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.

bug:18522998

Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
 2014-12-11 22:59:12 -08:00
Wink Saville
6cc44cce0e am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:40 +00:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Craig Mautner
922f8e2c0f am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
  Don't apply animations to windows that are showing
 2014-12-11 22:29:58 +00:00
Craig Mautner
72b047c6c3 Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev 2014-12-11 22:27:54 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 13:37:50 -08:00
Craig Mautner
cb17f18952 Don't apply animations to windows that are showing 
If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.

Fixes bug 18689396

Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb
 2014-12-11 11:24:32 -08:00
John Spurlock
6f9a71729f am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-11 18:34:14 +00:00
John Spurlock
0537caa1e0 Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 2014-12-11 18:27:11 +00:00
John Spurlock
29b7872bf4 Zen: Leave zen=none on manual ringer mode stream volume changes. 
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
 2014-12-11 12:54:41 -05:00
Narayan Kamath
6fe0fd69a1 am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
* commit '15cd63027bc8413659114714068a665869a4b3b2':
  Avoid tearing down process groups twice.
 2014-12-11 10:34:09 +00:00
Narayan Kamath
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +00:00
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
Amith Yamasani
a2530e4aa4 am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'ee24d848a5f270fb2d18150ab14200e62c9fd118':
  Stop guest user on exiting, to conserve resources
 2014-12-10 23:18:26 +00:00
Amith Yamasani
ee24d848a5 Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 2014-12-10 22:54:29 +00:00
Amith Yamasani
6f96a44df3 Stop guest user on exiting, to conserve resources 
Bug: 18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
 2014-12-10 14:21:48 -08:00
Dianne Hackborn
dc1e9f4813 am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'e207ffe01d3e9185f2cac9501354a5236abcedad':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-10 21:59:39 +00:00
Dianne Hackborn
e207ffe01d Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 2014-12-10 21:56:08 +00:00
Jason Monk
65c08ec82a am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
  Handle policy change while keyguard disabled
 2014-12-10 21:11:30 +00:00
Jason Monk
4ef9edeb67 Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 2014-12-10 21:04:27 +00:00
Benjamin Franz
df55bf45e8 am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 
* commit 'a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 20:34:36 +00:00
Benjamin Franz
a96ba381cf Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 2014-12-10 20:29:25 +00: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
Narayan Kamath
034ef013ec Avoid tearing down process groups twice. 
The second removal always triggers a warning.

Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18
 2014-12-10 11:56:32 -08:00
Svet Ganov
a706c9079a am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev 
* commit 'e39fc96c04a09a58acb2547a2066e0662791a69b':
  Ignore accessibility overlay when computing window's interactive region.
 2014-12-10 19:42:08 +00:00
Svet Ganov
e39fc96c04 Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev 2014-12-10 19:35:05 +00:00
John Spurlock
24ca556dce am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
* commit 'e03e245610c7f406a6cc0de998d71313a285953a':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:22:41 +00:00
John Spurlock
e03e245610 Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 2014-12-10 19:14:27 +00:00
John Spurlock
8403b7535b NoMan: Apply audio restrictions when effects are disabled by listeners. 
Bug: 17990185
Change-Id: Id946fab4dd27e2354919de6a98c009bc2e711240
 2014-12-10 13:56:13 -05:00
Dianne Hackborn
d52589185f am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit 'd63722429e311eca2ec9e9a9f80704bc521fef54':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 18:45:20 +00:00
Dianne Hackborn
d63722429e Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-10 18:37:51 +00:00
Dianne Hackborn
ae6cc8af26 Further work on issue #18640385: Add procstats test mode 
Tune sampling periods:

- Lower minimum sample interval when in test mode.
- Add a check when sampling pss to make sure this is at least 1
  second since the pss changed, to reduce the amount of bad
  data (very small pss samples) that we see.

Change-Id: I624a7d0480f3f6b22d229744e028d13a2c7b0e89
 2014-12-10 10:33:27 -08:00
Dianne Hackborn
6466126ab0 Fix issue #18683980: questions on LMK memory changes 
Getting the denominator right is kind of important.

Change-Id: Iff02a0a95eccd1231042e4ea96011c8cee0fee02
 2014-12-10 09:56:48 -08:00
Benjamin Franz
5b614593e1 Only add successfully bound profile services to mProfileServices. 
This causes crashes on all devices that disable the BluetoothHeadset
service when disabling bluetooth and thereby trying to unbind all
services.

Bug: 18669882
Change-Id: I48978a1556ead967c848c5bd9f6e001d38754b8d
 2014-12-10 17:06:06 +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
Wale Ogunwale
bfa6059b78 Always take an activity screenshot when pausing. 
automerge: 37f2718

* commit '37f271869ed9c9e9f0e7de7339017e0bb6719780':
  Always take an activity screenshot when pausing.
 2014-12-10 00:57:51 +00:00
Wale Ogunwale
37f271869e Always take an activity screenshot when pausing. 
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.

Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit eacdf2ce04899b0a3abef55e4e7e1fe9c1649932)
 2014-12-10 00:44:28 +00:00
Amith Yamasani
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00: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
John Reck
4f1942d999 Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 2014-12-09 23:12:42 +00:00