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

153294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsuwei Chen
cf03b60ce2 Use the right format to specify SUPL_MODE value. 
Bug:17618140
Change-Id: I013219bb8febb4bb5c23d4896f432fd3a01c21f8
 2014-09-23 18:31:48 -07:00
Lorenzo Colitti
1d7142f2a8 am 895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev 
* commit '895b6726e13611a614d245bbd4232f9f0449727f':
  Only stop/start clatd if necessary.
 2014-09-24 01:29:44 +00:00
Lorenzo Colitti
34feaa0947 am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 
* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
  Block address families with routes, not NetworkAgent side channel
 2014-09-24 01:29:36 +00:00
Alan Viverette
7306924cfa am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev 
* commit 'f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
  Explicitly set Settings background to white
 2014-09-24 01:29:30 +00:00
Lorenzo Colitti
75b8966cad Merge "Only stop/start clatd if necessary." into lmp-dev 2014-09-24 01:21:17 +00:00
Lorenzo Colitti
e034716628 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
Alan Viverette
ef686b3c44 Merge "Explicitly set Settings background to white" into lmp-dev 2014-09-24 01:17:53 +00:00
Alan Viverette
dfd9376072 Explicitly set Settings background to white 
Fixes a regression where the background was previously the default
color, then changed to #eee even though we still want #fff here.

Removes unnecessary windowBackground re-definition.

BUG: 17520824
Change-Id: I9b3a751ce55fc018a90132078a8e308067f62445
 2014-09-23 18:15:31 -07:00
Dianne Hackborn
193b14c468 am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 
* commit '0d18d08d54cd2226e2391a8bf50e8e48add24ee0':
  Work on issue #17628623: Need to update default preferred activities for YouTube
 2014-09-24 01:12:52 +00:00
Matthew Williams
319df9f7bb am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev 
* commit '07b554fcce08611872ea053ea9c97fa2671fc6db':
  Fix lock ordering in JobScheduler
 2014-09-24 01:12:47 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00
Matthew Williams
8cfd9e6c11 Merge "Fix lock ordering in JobScheduler" into lmp-dev 2014-09-24 00:58:55 +00:00
Matthew Williams
48a30db75d Fix lock ordering in JobScheduler 
BUG: 17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.

Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
 2014-09-23 17:34:46 -07:00
Jeff Sharkey
5c1ac3d443 am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 
* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
  More ACTION_CHOOSER ClipData migration.
 2014-09-24 00:05:53 +00:00
Svetoslav
822a58aad3 am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev 
* commit '857f80134d6c23894f5589457883c57137b2ed27':
  Fix ANR in print spooler.
 2014-09-24 00:00:13 +00:00
Svetoslav
24ef6e43db am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev 
* commit 'ea5d75d807b379592f3bfd6ccd4cb43d02f72f49':
  Print spooler crash on back before first layout is complete.
 2014-09-24 00:00:08 +00:00
Jeff Sharkey
fb488eb2a2 Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 2014-09-23 23:58:51 +00:00
Svetoslav
09eb0b2033 Merge "Fix ANR in print spooler." into lmp-dev 2014-09-23 23:53:21 +00:00
Svetoslav
2eefd97be6 Merge "Print spooler crash on back before first layout is complete." into lmp-dev 2014-09-23 23:52:59 +00:00
Dianne Hackborn
eeb2c7e712 Work on issue #17628623: Need to update default preferred activities for YouTube 
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are.  Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).

And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p

Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
 2014-09-23 16:45:39 -07:00
Michael Wright
8c4f7a260b am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev 
* commit 'd8e4e4aef15ca2edaa8b18d221cbd80240359445':
  Add keylayout for Asus Gamepad
 2014-09-23 23:41:38 +00:00
Jeff Sharkey
c004eef7bb More ACTION_CHOOSER ClipData migration. 
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData.  Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent.  Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.

Bug: 17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
 2014-09-23 16:40:53 -07:00
ztenghui
80f44408a1 Add one more test and update old tests 
This is just updating the internal test app.
No real functionality changed.

b/17631551

Change-Id: Icc01e017ea4fbf97712214e6ac02691d29ea5e96
 2014-09-23 16:35:53 -07:00
Michael Wright
abe2df111f Merge "Add keylayout for Asus Gamepad" into lmp-dev 2014-09-23 23:35:20 +00:00
Svetoslav
5668348138 Fix ANR in print spooler. 
Saving to PDF a subset of the pages requires trimming the
undesired pages and when this is done writing the ready doc
to a URI. To write the file to URI we have to obtain it but
it is aquired by the shredding task and never released. Now
we are releasing the document immediately after trimming it.

bug:17631301

Change-Id: I4db7966c65c75f0f14c3cb52fd83b4d8fd5a4687
 2014-09-23 16:25:54 -07:00
Igor Murashkin
2b268d7f8f am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 
* commit 'e3ad6ff81c8913ea55df88d8af019769a55f51e3':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
 2014-09-23 23:12:15 +00:00
ztenghui
98916d146a Fix AVD for CTS failure. 
Mostly about changingConfig flags, the fix is just a copy from VectorDrawable.

b/17631551

Change-Id: Ibad9c2f61cd86b15e9bca1d1991c8cd147897bb0
 2014-09-23 16:07:27 -07:00
Michael Wright
5ba44281c7 Add keylayout for Asus Gamepad 
Bug: 17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
 2014-09-23 16:04:35 -07:00
Igor Murashkin
a040e44417 am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 
* commit 'c79b145f0216d2f9b099a409fee2c154de1f7019':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
 2014-09-23 22:59:56 +00:00
Svetoslav
254361f136 Print spooler crash on back before first layout is complete. 
If the user presses back before the remote print document
update has completed we get a crash. The reason is that
after the update completion we were trying to finish the
activity if we are in a cancelled state but this is not
needed as we aready handled the back key so we will finish.
Handling finish twice was creating the problem as classes
with lifecycles are not designed to be used after being
finished. In particular, we were calling doFinish() twice.

bug:17630561

Change-Id: If418f237a2def7c8e4a072ac8826283f4dd7fc85
 2014-09-23 15:54:24 -07:00
vandwalle
e70f3bbfb7 am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '9794dc9569fd33ea706370ee153446645a7b1474':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 22:53:20 +00:00
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +00:00
vandwalle
5a94fd7c04 am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 22:41:28 +00:00
Wink Saville
b43795579b am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit 'af23987e8d704f6436984661536af293712e4467':
  Add SM isUsableSubIdValue
 2014-09-23 22:36:02 +00:00
vandwalle
ba46bac83a Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 2014-09-23 22:31:34 +00:00
Wink Saville
3bb63f423e Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 2014-09-23 22:25:07 +00:00
Igor Murashkin
a0496d34ff camera2-legacy: Workaround max jpeg/preview size AR mismatch 
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.

Bug: 17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
 2014-09-23 15:11:36 -07:00
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07:00
Jeff Brown
0dc92f3a43 am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit 'e43684a64c35e3a627037a671d351bda12e5eb0a':
  Move setting the display state out of the critical section.
 2014-09-23 21:15:27 +00:00
Jay Shrauner
5b0ec499fb am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '6b70083ac1ec46451ab4b1902c4246a8063831d8':
  Fix NPE crash when mPhone is null
 2014-09-23 21:15:23 +00:00
Dianne Hackborn
588016f72e am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'c39f4fc2c4110170deec0deaae104ae474022c59':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:15:20 +00:00
Adam Powell
3b00941049 am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '0bff30ba60607232054d80090fb22916f1f7e551':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:06:47 +00:00
Jeff Brown
490fc7b577 am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit '42ecd1447eb31fb6e1a08a7f47b73805b0250680':
  Move setting the display state out of the critical section.
 2014-09-23 21:06:25 +00:00
Jay Shrauner
368ad52604 am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '44318d379813d9264aafa06a5376e115fe53f1ae':
  Fix NPE crash when mPhone is null
 2014-09-23 21:06:21 +00:00
Dianne Hackborn
14f10be0bf am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:06:17 +00:00
Jeff Brown
6800e1b921 Merge "Move setting the display state out of the critical section." into lmp-dev 2014-09-23 21:02:43 +00:00
Jay Shrauner
2fbab892e9 Merge "Fix NPE crash when mPhone is null" into lmp-dev 2014-09-23 20:59:15 +00:00
Adam Powell
6c0b8b794a am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
  Track persistent nested Y offset for fling velocity
 2014-09-23 20:55:35 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
Adam Powell
01db31f899 Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 2014-09-23 20:46:47 +00:00