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

115727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
3b4e322b47 am e40b3033: am 5088fc85: Merge "Specialized prompting when \'home\' has become ambiguous" into klp-dev 
* commit 'e40b3033422c326340957989eafd1659565fb132':
  Specialized prompting when 'home' has become ambiguous
 2013-10-02 09:35:56 -07:00
Craig Mautner
c5495c93e5 am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev 
* commit 'eba784f0847a1d7c747603994d09937dcfdc0671':
  Add a timeout for removing starting windows.
 2013-10-02 09:35:49 -07:00
Alan Viverette
0adaf03488 am 6320305a: am f079a6d0: Merge "Set live region property on AccessibilityNodeInfo" into klp-dev 
* commit '6320305a609d0c4a3b64088fe826c5cebadec985':
  Set live region property on AccessibilityNodeInfo
 2013-10-02 09:35:29 -07:00
Alan Viverette
e3ba7f24da am c379752a: am 3320ef95: Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev 
* commit 'c379752a32c7d77fe144e1a6e441ef871001d080':
  Add findFocus API for AccessibilityNodeProvider
 2013-10-02 09:35:25 -07:00
Jeff Sharkey
7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:35:14 -07:00
Lajos Molnar
36c4adf9f7 am 990615e3: am fcd61bb5: Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-dev 
* commit '990615e3b600697c2b8460072cc3c9154f6476ea':
  Fix MediaTimeProvider seek & time drift recovery issue
 2013-10-02 09:35:04 -07:00
Daniel Sandler
484b80a456 am 6812b03e: am 7eb5ce03: Merge "Update date format in panel on locale change." into klp-dev 
* commit '6812b03ee313a346c2216f4a2d7a51cf88733b57':
  Update date format in panel on locale change.
 2013-10-02 09:34:39 -07:00
Baligh Uddin
7e8d9dbaf3 am be69d3f9: (-s ours) am 48cc1dc4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be69d3f91e382127820575128b5723fed8f860ff':
  Import translations. DO NOT MERGE
 2013-10-02 09:34:37 -07:00
Baligh Uddin
bcb3643fce am 63bc5d85: (-s ours) am ab705268: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '63bc5d8527cc0200e54a2642a3b55da0f5be170a':
  Import translations. DO NOT MERGE
 2013-10-02 09:34:34 -07:00
Baligh Uddin
fec60dd7ad am 2f4ab564: (-s ours) am bf83288b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f4ab564e0eae03d315984d98aa09f13c0533403':
  Import translations. DO NOT MERGE
 2013-10-02 09:34:31 -07:00
Baligh Uddin
17d4e5032a am ae9358ef: (-s ours) am 8e1a4813: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ae9358ef5e3a3e016469ebd6b810ab504e4e10dd':
  Import translations. DO NOT MERGE
 2013-10-02 09:34:28 -07:00
Baligh Uddin
de5f6550a2 am 1d63d580: (-s ours) am 71dfe63f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1d63d580f95469fb3a2cd7d92cc69fbf1432d478':
  Import translations. DO NOT MERGE
 2013-10-02 09:34:25 -07:00
Igor Murashkin
606926eddf am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev 
* commit '1b1cb30d8e7aefb5466ca20e593f8d8062d36b81':
  camera2: Fix CameraMetadata#getKeys
 2013-10-02 09:34:22 -07:00
Michael Wright
cd479b6e88 am 02cefe27: Merge "Move slide to unlock circle up" into klp-dev 
* commit '02cefe27f334c0919983ec62ab7b679696d3b6b8':
  Move slide to unlock circle up
 2013-10-02 09:34:13 -07:00
Mike Lockwood
9db72a5121 am 68c692df: Revert "Allow L2CAP sockets" 
* commit '68c692df5f667dcee42506d3c6459d3dc2e1cdd6':
  Revert "Allow L2CAP sockets"
 2013-10-02 09:18:57 -07:00
Jeff Sharkey
d01571e6d4 Isolate calls to each remote DocumentsProvider. 
All background work is going through AsyncTasks, which uses a shared
thread pool.  Even with the new ContentProviderClient logic to detect
ANRs, the UI can still appear to be unresponsive for 20 seconds, even
if the user attempted to switch to a different backend.  In the worst
case, a backlog of thumbnail requests would end up wedging Loaders
for a long time, since they all share the same THREAD_POOL_EXECUTOR.

This change isolates calls to each provider onto their own thread,
which they're free to wedge and recover from over time.

It also means we no longer need a dedicated thread pool for recents
loading, and can use a simpler Semaphore instead.

Disables thumbnails in recents on svelte devices.

Bug: 10993301, 11014856
Change-Id: I7f8a5bbb5f64437e006cb2c48b7e854136d5c38c
 2013-10-02 08:54:02 -07:00
Mike Lockwood
68c692df5f Revert "Allow L2CAP sockets" 
This reverts commit 34b0f926135b4697f091b3b39bfca8c70512af6c.
 2013-10-02 07:56:46 -07:00
Svetoslav
2caf51b5bf am 8fd521c7: am 95b1bbfe: Merge "Fix the build" into klp-dev 
* commit '8fd521c7447a6f95006adb56cfa60ff49e1befab':
  Fix the build
 2013-10-01 23:11:00 -07:00
Jeff Brown
d09d5f9e4c am 10478213: am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev 
* commit '10478213759a486524000c4164e4176437afa2d7':
  Reset insets when inset computer is removed.
 2013-10-01 23:10:56 -07:00
Dianne Hackborn
b8aa12273f am af85c03d: am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev 
* commit 'af85c03deb3506cebebd1719df4bfb844505fc9d':
  Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature.
 2013-10-01 23:10:53 -07:00
Jean-Michel Trivi
4c9110fcfc am 13715943: am b4c6b241: Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev 
* commit '13715943f24760fbeb462dd601a52af410faac20':
  Cache RemoteController artwork bitmap size, use it in registration
 2013-10-01 23:10:49 -07:00
Jean-Michel Trivi
e8e560e061 am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev 
* commit 'db0944de128247e7e6016982a14513b04ac5e6f1':
  Improve RemoteControlDisplay registration
 2013-10-01 23:10:46 -07:00
John Reck
a9212864f3 am 6fe99af1: am 288180c2: Merge "Avoid accidentally using software layers" into klp-dev 
* commit '6fe99af1bdc00471662ea2fdec0317910a7c3e2b':
  Avoid accidentally using software layers
 2013-10-01 23:10:42 -07:00
Svetoslav
8fd521c744 am 95b1bbfe: Merge "Fix the build" into klp-dev 
* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
  Fix the build
 2013-10-01 22:22:00 -07:00
Jeff Brown
1047821375 am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev 
* commit '5e65adaf4131bb08862fd5eae249a1f713b8ed51':
  Reset insets when inset computer is removed.
 2013-10-01 22:21:55 -07:00
Dianne Hackborn
af85c03deb am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev 
* commit 'b9edb3a22b3342912bb9eef79aee0bfcb6be1675':
  Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature.
 2013-10-01 22:21:52 -07:00
Jean-Michel Trivi
13715943f2 am b4c6b241: Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev 
* commit 'b4c6b241fb96e4482dd7c29f5ec54e40aacbbd25':
  Cache RemoteController artwork bitmap size, use it in registration
 2013-10-01 22:21:49 -07:00
Jean-Michel Trivi
db0944de12 am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev 
* commit '60e7f8191e75b8029da72f5248d6b4480bc0beac':
  Improve RemoteControlDisplay registration
 2013-10-01 22:21:46 -07:00
John Reck
6fe99af1bd am 288180c2: Merge "Avoid accidentally using software layers" into klp-dev 
* commit '288180c24434ba5b0f35e8f22d39b109b46270e2':
  Avoid accidentally using software layers
 2013-10-01 22:21:30 -07:00
Craig Mautner
611fb91723 am 09be37b2: Merge "Add debuggging for 10858941." into klp-dev 
* commit '09be37b2d3e66b7d718b0fd0ea9e73ad15493acb':
  Add debuggging for 10858941.
 2013-10-01 22:06:28 -07:00
Craig Mautner
09be37b2d3 Merge "Add debuggging for 10858941." into klp-dev 2013-10-02 05:04:07 +00:00
Dianne Hackborn
239dc099a0 am 164371fb: Fix issue #11005453: [SUW] G+ profile creation for new user broken 
* commit '164371fb759bad6854570af0fca60d9a01e17235':
  Fix issue #11005453: [SUW] G+ profile creation for new user broken
 2013-10-01 21:52:35 -07:00
Craig Mautner
323f78001d Add debuggging for 10858941. 
Change-Id: I0517ccd9a83ef19a9002d61dbebf36d0120e1f63
 2013-10-01 21:16:22 -07:00
Elliott Hughes
badb9b0c3b am 7fce50eb: am ad8ec14f: am 7fb64c6e: Merge "more locale-appropriate screenshot share text" 
* commit '7fce50eb7c62f77c77e1890a44075fb3cf979420':
  more locale-appropriate screenshot share text
 2013-10-01 20:59:39 -07:00
Elliott Hughes
3f54de6ba7 am 32393fd8: am 591e8ae3: am b4d1ad29: Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)" 
* commit '32393fd82ad699bc4619e4f7ed4387593f3b5539':
  Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
 2013-10-01 20:59:33 -07:00
Matthew Williams
95906af264 Merge commit '0e0f6003' into manualmerge 
Conflicts:
	services/java/com/android/server/content/SyncManager.java

Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08
 2013-10-01 20:54:01 -07:00
Dianne Hackborn
164371fb75 Fix issue #11005453: [SUW] G+ profile creation for new user broken 
The main problem here was a mistake when turning a single process
structure to a multi-package-process structure with a common
process.  When we cloned the original process state, if there were
any services already created for the process for that package, they
would be left with their process pointer still referencing the
original now common process instead of the package-specific process,
allowing the active counts to get bad.  Now we switch any of those
processes over to the new package-specific process.

There was also another smaller issue with how ServiceRecord is
associated with a ServiceState -- we could be waiting for an
old ServiceRecord to be destroyed while at the same time creating
a new ServiceRecord for that same service class.  These would share
the same ServiceState, so when the old record finally finished
destroying itself it would trample over whatever the new service
is doing.

This is fixed by changing the model to instead of using an "active"
reference count, we have an object identifying the current owner
of the ServiceState.  Then when the old ServiceRecord is cleaning
up, we know if it is still the owner at that point.

Also some other small things along the way -- new Log.wtfStack()
method that is convenient, new suite of Slog.wtf methods, fixed
some services to use Slog.wtf when catching exceptions being
returned to the caller so that we actually know about them.

Change-Id: I75674ce38050b6423fd3c6f43d1be172b470741f
 2013-10-01 20:51:12 -07:00
Svetoslav
2f5440bd3b am cbf3f2cd: Merge "Adding an empty state UI for the printer search activity in the spooler." into klp-dev 
* commit 'cbf3f2cde569aac3a49d888d2bd52d77dc139738':
  Adding an empty state UI for the printer search activity in the spooler.
 2013-10-01 19:24:31 -07:00
Svetoslav
cbf3f2cde5 Merge "Adding an empty state UI for the printer search activity in the spooler." into klp-dev 2013-10-02 02:21:29 +00:00
Svetoslav
4e4874bb71 Sometimes printer selection from all printers activity does not work. 
1. Sometimes selecting a printer from the full printer list does not
   work if the selected printer was not in the initial drop down list
   of the print dialog.

   The reason was that there is a race. We use loaders in the print
   dialog activity and the all printers one. When these loaders are
   stopped we stop printer discovery since we do not want to keep this
   potentially expensive process on going if the activity is paused
   because say the user decide to press home and start playing his
   favorite game while the printers dialog is up. As a result the
   loader does not get printer updates until it is started.

   The loader of the print dialog activity is stopped while the user is
   selecting a printer from the all printers activity whose loader is
   getting discovered recent printers. Now when the user selects a printer
   the loader of the print dialog activity is started but may not get
   the latest printers by the time onActivityResult is called with the
   selected printer. Now we cache the selected printer id and if the
   loader reports it we select that printer.

2. In the print dialog we show only a few of the discovered printers.
   If the user selects a printer from the all printers activity that
   is not in the initial list we shuffle the adapter data to make sure
   the selected printer is in the shown subset. Now if the printers
   change, i.e. the printers loader reports new result we were not
   respecting the reshuffling made before so the short list of
   printers changes yet again.

bug:11034216

Change-Id: I54fe3619e3328b65839d9f4b02309699eae7f8eb
 2013-10-01 19:12:27 -07:00
Adam Lesinski
ff7cba54fc am 42e9b631: Merge "Make room for new public flags" into klp-dev 
* commit '42e9b63100edfef7a9cbee735ee3574fb1b94349':
  Make room for new public flags
 2013-10-01 18:57:43 -07:00
Adam Lesinski
42e9b63100 Merge "Make room for new public flags" into klp-dev 2013-10-02 01:55:09 +00:00
Jeff Brown
9601b51cd9 am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev 
* commit '42544cf843a8e6a3d6ecf57aafdc5a3591a16d17':
  Track wireless charger detector timeout explicitly.
 2013-10-01 18:50:42 -07:00
Alan Viverette
69fdba4c38 am ed2cfdbf: am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev 
* commit 'ed2cfdbf42203463cffbbc7184d93af6187c60fc':
  Rebind transient state views when available
 2013-10-01 18:50:27 -07:00
Amith Yamasani
a2957bdcca am 32ff8c14: am f55cf7fc: Merge "Adjust padding for keyguard pin entry keys" into klp-dev 
* commit '32ff8c14b285bed93a1e8ec65a49debfdd3cbaef':
  Adjust padding for keyguard pin entry keys
 2013-10-01 18:50:24 -07:00
Robert Greenwalt
d29724c640 am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev 
* commit '2b6b3d9c495d3c8332aad6515a1db06e8fde3848':
  Use a build-specific wifi country code
 2013-10-01 18:50:20 -07:00
Jim Miller
7f5348b093 am 102f0e05: am 8b3bc51c: Merge "Disable keyguard widgets on low memory devices" into klp-dev 
* commit '102f0e05ba1efb76a3f68ae57fbea4dd85fa1ef8':
  Disable keyguard widgets on low memory devices
 2013-10-01 18:50:17 -07:00
Adam Powell
04ac7e4bab am 6d0c46fc: am 81517c86: Merge "Make toast frames a little more opaque" into klp-dev 
* commit '6d0c46fc8b5aa064dbb18db9b566bfc8c8eff102':
  Make toast frames a little more opaque
 2013-10-01 18:50:14 -07:00
Matthew Xie
3d2a664a42 am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev 
* commit '9eb9ebb2fbbe1135919cf685d84eba18cfecdf01':
  Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
 2013-10-01 18:50:10 -07:00
Craig Mautner
1cbb42dfea am 7d4e6365: am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev 
* commit '7d4e6365fb87c198ca54fc1d8e979b67d578c28a':
  Don't display hidden activities over home screen.
 2013-10-01 18:50:07 -07:00