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

113609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
b649443b3c am a5ec4d4b: am 5daf77d0: am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit 'a5ec4d4b54440dd7f56661ebf602498d2b08526c':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 16:11:11 -07:00
Christopher Tate
a5ec4d4b54 am 5daf77d0: am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit '5daf77d00d0fd93f24f9dc6013ee838411e9adf9':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 15:05:31 -07:00
Christopher Tate
5daf77d00d am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit 'ac39c604d6df8631922c2295b3341cd561f172a5':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 15:02:06 -07:00
Christopher Tate
ac39c604d6 Merge "Fix formatting in clearApplicationUserData exception message." 2013-09-13 21:58:45 +00:00
Tor Norbye
a7726271f7 Replace wildcard imports with explicit imports 
The wildcard imports interfered with the new typedef annotations (and
99% of the tests were using explicit imports anyway.)

Change-Id: I3784b9d700131fe4a0ba30283f052820b2fa5122
 2013-09-13 14:22:36 -07:00
Dianne Hackborn
cd71cf1738 am bab31979: am 9210bc85: Implement #10744011: Serialize running of background services 
* commit 'bab3197988bd95629d74541ab62f3b7dc1b247ce':
  Implement #10744011: Serialize running of background services
 2013-09-13 13:27:17 -07:00
John Spurlock
19522aba8d am 0899d983: am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '0899d983ffbbcf7b9bd9ff0eb83f11f5fe260e26':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:27:13 -07:00
Dianne Hackborn
bab3197988 am 9210bc85: Implement #10744011: Serialize running of background services 
* commit '9210bc85545f31973c957b5179e6a82d05f473c6':
  Implement #10744011: Serialize running of background services
 2013-09-13 13:20:34 -07:00
John Spurlock
0899d983ff am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '49580cf1f768eb90a85f79f1cb7019d08d93332a':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:20:01 -07:00
Dianne Hackborn
9210bc8554 Implement #10744011: Serialize running of background services 
Added some code to the activity manager to keep track of
services that are launching and limit the number that can
be launched concurrently.  This only comes into play under
specific circumstances: when the service launch is a background
request (so timing is not important) and its process is not
already running at a high priority.

In this case, we have a list of services that are currently
launching and when that gets too big we start delaying the
launch of future services until currently launching ones are
finished.

There are some important tuning parameters for this: how many
background services we allow to launch concurrently (currently
1 on low-ram devices, 3 on other devices), and how long we
wait for a background service to run before consider it to be
a more long-running service and go on to the next pending
launch (currently set to 15 seconds).

Also while in here, did some cleanup of the service code:

- A little refactoring to make per-user data cleaner.
- Switch to ArrayMap.

Change-Id: I09f372eb5e0f81a8de7c64f8320af41e84b90aa3
 2013-09-13 09:58:48 -07:00
Alex Klyubin
03ea04715c Fix formatting in clearApplicationUserData exception message. 
Before:
  4539 does not have permission:android.permission.CLEAR_APP_USER_DATA to clear datafor process:com.android.chrome
After:
  PID 4539 does not have permission android.permission.CLEAR_APP_USER_DATA to clear data of package com.android.chrome

Change-Id: Ic466decb050e4fa7f3fee4098c4f2abdc6cedf5c
 2013-09-13 09:51:42 -07:00
Sungsoo Lim
42a1390499 Update api/current.txt 
Needed to run make update-api after
the merge of http://goo.gl/6RC3I4

Change-Id: If6cf3a520ff14c37a2ba317b799d246be2b620af
 2013-09-13 20:48:12 +09:00
John Spurlock
49580cf1f7 Merge "SystemUI status bar/quick settings updates." into klp-dev 2013-09-13 08:42:06 +00:00
Kenny Root
add53aeaeb am 7bc59add: am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '7bc59add59412f2461213d0ff7ea59b2ac76cec0':
  Move helper function to webkit
 2013-09-12 23:41:41 -07:00
Kenny Root
7bc59add59 am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '753c1a3342357eed6b29c08ad8ca708755d84390':
  Move helper function to webkit
 2013-09-12 23:39:01 -07:00
Kenny Root
753c1a3342 am 457f0f5e: Merge "Move helper function to webkit" 
* commit '457f0f5e486c158bbe9816df39d2cbc52cec3b51':
  Move helper function to webkit
 2013-09-12 23:35:13 -07:00
Kenny Root
457f0f5e48 Merge "Move helper function to webkit" 2013-09-13 06:30:53 +00:00
Kenny Root
cb4317a5a7 Move helper function to webkit 
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
 2013-09-12 23:00:54 -07:00
Lajos Molnar
4e8f5e3f78 am 6118745b: am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 
* commit '6118745be53fed977edf1b29a2b0ecd2222e33a8':
  MediaFormat: add getInteger with default value convenience method
 2013-09-12 21:57:28 -07:00
Jean Chalard
f6fac14e2e am 4895ec3d: am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev 
* commit '4895ec3dcc214891b9788cde3c9720ee9656596c':
  Don't send the same values to onUpdateSelection repeatedly
 2013-09-12 21:57:24 -07:00
Lajos Molnar
fb73df74d5 am 736469ad: am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev 
* commit '736469ad5d9b21071d187a07e8f2575910960b7d':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
 2013-09-12 21:57:21 -07:00
Kenny Root
bd51158d61 resolved conflicts for merge of aca95ca0 to master 
Change-Id: I91adf923288ca724a8040ecf887e28e42ad7e259
 2013-09-12 21:49:35 -07:00
Svetoslav
90ce2f3f52 am 9282b9ac: am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit '9282b9ac8eda1591bb54b46ddc4e88da1c2f0c56':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:42:28 -07:00
Romain Guy
b1c53942f1 am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev 
* commit '0885b291650c1b85220645943c9eab3080170aca':
  Always disable the clip for layers Bug #8149344
 2013-09-12 21:42:25 -07:00
Jeff Sharkey
156ba58f9b am cf76be71: am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit 'cf76be7195fc42ac6d72cb2d38309894fff4d368':
  DocumentsUI tablet support.
 2013-09-12 21:42:22 -07:00
Robert Greenwalt
cc7360c354 am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 
* commit '3d52eb7f1dde460d547fc20ec0b93465d69ec496':
  Fix Batched Scan Results to give Timestamp in uS
 2013-09-12 21:42:18 -07:00
Wink Saville
afc79c4eab am d8fcc795: am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit 'd8fcc7951f02e3c66f549937a2b1458a4352d174':
  Define config_volte_replacement_rat.
 2013-09-12 21:42:15 -07:00
Stephen Hines
93a7473092 am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev 
* commit '7d400eadb7340c139f35263f43fe3418d402f409':
  Fix build break with missing VDBG.
 2013-09-12 21:42:12 -07:00
Raph Levien
e631c9ff2e am dcb2c68f: am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 
* commit 'dcb2c68fd145ab6812a49da30731d6cde2f16cd1':
  Fix for AIOBE at android.text.AndroidBidi.directions
 2013-09-12 21:42:09 -07:00
Selim Gurun
e68e06d0b9 am 2b274021: am 76ffaa58: Merge "Publish Print Api for Webview" into klp-dev 
* commit '2b274021f28e92cb7e32d6194f54cb5c374add93':
  Publish Print Api for Webview
 2013-09-12 21:42:05 -07:00
Lajos Molnar
6118745be5 am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 
* commit 'ab62870c7e787323057d3b16a3ff1fd118fb5925':
  MediaFormat: add getInteger with default value convenience method
 2013-09-12 21:38:04 -07:00
Jean Chalard
4895ec3dcc am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev 
* commit '940a2ad69eaf25ef16b6f470f759f9eef28fc0c5':
  Don't send the same values to onUpdateSelection repeatedly
 2013-09-12 21:38:01 -07:00
Lajos Molnar
736469ad5d am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev 
* commit '8c16943ef3259b8194c310d41edc13a783249250':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
 2013-09-12 21:37:58 -07:00
Alan Viverette
aca95ca0e3 am 2a65a283: Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 
* commit '2a65a2839e9b3e59a72348ee088f86cda7df604a':
  Add live region politeness to View, AccessibilityNodeInfo
 2013-09-12 21:37:50 -07:00
Svetoslav
9282b9ac8e am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit 'b72ff5aa4b8be587bcea82761aa08cd8c14b8b48':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:37:37 -07:00
Romain Guy
0885b29165 am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev 
* commit '4801a4f90710427f71b717c6869a63113846689a':
  Always disable the clip for layers Bug #8149344
 2013-09-12 21:37:32 -07:00
Jeff Sharkey
cf76be7195 am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit '95a6560f63563aeb36a56fb0384685a2f925d3c1':
  DocumentsUI tablet support.
 2013-09-12 21:37:18 -07:00
Robert Greenwalt
3d52eb7f1d am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 
* commit '14e55996722db1e74996b837c136a6e188143718':
  Fix Batched Scan Results to give Timestamp in uS
 2013-09-12 21:37:13 -07:00
Wink Saville
d8fcc7951f am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit '5fbfb81d31d452f75bc088d380711642993fef1c':
  Define config_volte_replacement_rat.
 2013-09-12 21:37:08 -07:00
Stephen Hines
7d400eadb7 am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev 
* commit '9d5c33c58451aac8566b8df8426265cedd3e610f':
  Fix build break with missing VDBG.
 2013-09-12 21:37:03 -07:00
Raph Levien
dcb2c68fd1 am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 
* commit '7558ec405f67b59afbf6089d13928cfdb2f950ff':
  Fix for AIOBE at android.text.AndroidBidi.directions
 2013-09-12 21:36:57 -07:00
Selim Gurun
2b274021f2 am 76ffaa58: Merge "Publish Print Api for Webview" into klp-dev 
* commit '76ffaa5808331591d9db4c2abfe9f739eebb0be9':
  Publish Print Api for Webview
 2013-09-12 21:36:54 -07:00
Lajos Molnar
ab62870c7e Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 2013-09-13 02:18:23 +00:00
John Spurlock
2062abfa13 SystemUI status bar/quick settings updates. 
Status bar:
 - Update remaining mute/speakerphone icons.
 - Remove orange versions of wifi/signal icons.
 - Use only full versions of data type overlays.
 - Remove obsolete light versions of data type overlays.
 - Low battery color back to red.

Quick settings:
 - Update to indicate problem (orange) status.
 - Update to new battery style.

And a few remaining xx assets.

Bug:10680149
Bug:10502089
Bug:10729729
Bug:10316062
Change-Id: Iccd936d90271e4ec5c48e688917225136e7d45aa
 2013-09-13 02:18:14 +00:00
Jean Chalard
940a2ad69e Merge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev 2013-09-13 02:16:47 +00:00
Lajos Molnar
8c16943ef3 Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev 2013-09-13 02:16:27 +00:00
Alan Viverette
2a65a2839e Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 2013-09-13 01:45:10 +00:00
Svetoslav
b72ff5aa4b Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 2013-09-13 01:43:41 +00:00
Romain Guy
4801a4f907 Merge "Always disable the clip for layers Bug #8149344" into klp-dev 2013-09-13 01:18:31 +00:00
Selim Gurun
da7d642253 Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64

This is a cherry-pick of a5c86c644bce5f9d472541b2d1ddc1b39299f004
to prevent a automerger failure.

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewProvider.java
 2013-09-12 18:12:16 -07:00