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

113637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
f392e5d4f6 am 68862f07: (-s ours) am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '68862f07b6b8421a2d0aeafe62e4285525e14166':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:30:18 -07:00
Wink Saville
d80b0a9515 am 12d3f488: am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '12d3f488e79ba5afcc30bb2b4e555d06b2a34c74':
  checkMobileProvisioning should not block.
 2013-09-13 17:22:56 -07:00
Jason Monk
103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:22:53 -07:00
Scott Main
94a766a342 am bd04940c: am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'bd04940ca71d977c75c704a835faade2d311ab96':
  fix title for uses-sdk doc
 2013-09-13 17:22:49 -07:00
Christopher Tate
9b6c9a1592 am fcda3283: am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit 'fcda3283d27f8dfaa812fb735af43eea2e077c64':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:22:45 -07:00
Jeff Sharkey
4c7c51480e am f5513f41: am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit 'f5513f41fe041bef29ec70abdce7cc6f582a11c2':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:22:41 -07:00
Deepanshu Gupta
68862f07b6 am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '79a1a7c367214e86d1ea18fe07bc4d2d5bc00f76':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:14:48 -07:00
Wink Saville
12d3f488e7 am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '7770dcc3d351a494d0f5fe44feb776cc512e9b18':
  checkMobileProvisioning should not block.
 2013-09-13 17:14:15 -07:00
Jason Monk
f9464838fe am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit '312c495f4b8d002264772f61fe1fa3ef87bf3e52':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:14:10 -07:00
Scott Main
bd04940ca7 am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'cac2428da4a22d9526af09e1457a6b644b2c2057':
  fix title for uses-sdk doc
 2013-09-13 17:14:05 -07:00
Christopher Tate
fcda3283d2 am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit '7560c256ecacb5fa3904ec5c957e88331328f38b':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:14:00 -07:00
Jeff Sharkey
f5513f41fe am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit '0bf2ed90c42d3a1f1d4be4b70c337f9eaec9cd14':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:13:56 -07:00
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
Deepanshu Gupta
79a1a7c367 am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '31207780338b97e396927701ca0da7a61d6d44b2':
  Fix ClassCastException when rendering ListView
 2013-09-13 15:01:00 -07:00
Christopher Tate
ac39c604d6 Merge "Fix formatting in clearApplicationUserData exception message." 2013-09-13 21:58:45 +00:00
Deepanshu Gupta
3120778033 am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '0ecfe3819269062805c4c56cdc1470c2fc3856c8':
  Fix ClassCastException when rendering ListView
 2013-09-13 14:57:35 -07:00
Deepanshu Gupta
0ecfe38192 am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
  Fix ClassCastException when rendering ListView
 2013-09-13 14:55:06 -07: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
Wink Saville
7770dcc3d3 Merge "checkMobileProvisioning should not block." into klp-dev 2013-09-13 20:59:16 +00:00
Jason Monk
312c495f4b Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 2013-09-13 20:31:54 +00: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
Scott Main
cac2428da4 am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'a73e5df060262d1fc92f76fcc7a3a3d4537f9a0a':
  fix title for uses-sdk doc
 2013-09-13 13:04:43 -07:00
Scott Main
a73e5df060 am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'cdde6dc6675207708020fbe7458b13ccf22fe492':
  fix title for uses-sdk doc
 2013-09-13 13:02:20 -07:00
Christopher Tate
7560c256ec Merge "Add hidden API for querying available 'home' activities" into klp-dev 2013-09-13 20:01:17 +00:00
Jeff Sharkey
0bf2ed90c4 Merge "Move search to roots; Documents root; hide empty." into klp-dev 2013-09-13 20:00:14 +00:00
Scott Main
cdde6dc667 am 95e7df91: fix title for uses-sdk doc 
* commit '95e7df915fd3c173b4d8d71c1ac5cbeaa8c8e7ed':
  fix title for uses-sdk doc
 2013-09-13 12:59:59 -07:00
Scott Main
95e7df915f fix title for uses-sdk doc 
Change-Id: I544868d209f04cb46928861148e9320fc0118f56
 2013-09-13 12:55:20 -07:00
Wink Saville
d95ccc5c6a checkMobileProvisioning should not block. 
In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f
 2013-09-13 12:40:11 -07:00
Christopher Tate
a2a0850de8 Add hidden API for querying available 'home' activities 
To support improved home-app selection UX in Settings.

Bug 9958444

Change-Id: I106090784618bf7bea6fce28f4f9b9fb8480d310
 2013-09-13 12:16:00 -07:00
Jeff Sharkey
3e1189b359 Move search to roots; Documents root; hide empty. 
Documents searches now happen root-wide, instead of only under a
subdirectory.  Updates abstract class and flags to match.  Add flag
for a root to indicate it's empty, and hide empty roots in UI unless
creating.

Define "Documents" public directory and storage backend to contain
files.

Bug: 10712057, 10710865, 10710758
Change-Id: I8716367568969f9cb1d83927b2bf5a7013809350
 2013-09-13 11:35:04 -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
Jason Monk
6f8a68f49a Guarantee that PAC Local Proxy owns Port 
This changes the PAC support to not broadcast the Proxy information until
the Local Proxy has started up and successfully bound to a port so that
the local proxy information can be guaranteed to be owned by the proxy.

Bug: 10459877
Change-Id: I175cd3388c758c55e341115e4a8241884b90d633
 2013-09-13 09:53:26 -04: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