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

114682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
f420a76e62 am c96218a0: am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev 
* commit 'c96218a0575f7f5816104d38365c68a21c7b9ea6':
  Ensure that activities behind keyguard are paused.
 2013-09-24 10:22:22 -07:00
Vinit Deshapnde
ad93dc7f5c am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev 
* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c':
  Allow yet another combination of key management options
 2013-09-24 10:22:18 -07:00
Matthew Williams
9f584e576f am 05b51688: (-s ours) am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 
* commit '05b51688f656700f3b5a06ea9664c88215a07494':
  fix deadlock caused by clearAllBackoffs in SSE
 2013-09-24 10:22:14 -07:00
Baligh Uddin
2ff9b6ad57 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:34 +00:00
Baligh Uddin
872b036270 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:16 +00:00
Baligh Uddin
e0a2e43a13 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:58:12 +00:00
Svetoslav
6c1ea4b937 am cace0382: am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev 
* commit 'cace0382dd5233f75fb2201494a358d72dfd9256':
  Page ranges not correct in come cases.
 2013-09-23 19:04:04 -07:00
Dianne Hackborn
9ef68ecda5 am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 
* commit '8d4816d8fc9c1acbf377e7ee50b9871c4b5b8028':
  Issue #10461551: KLP API Review: AppOpsManager
 2013-09-23 19:04:00 -07:00
Craig Mautner
c96218a057 am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev 
* commit 'e14d0c211fb669f88c284af85c942135e834e498':
  Ensure that activities behind keyguard are paused.
 2013-09-23 18:59:05 -07:00
Vinit Deshapnde
10914a23f7 am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev 
* commit '662c326e5fc02fa11226de1267b7f60485f5638a':
  Allow yet another combination of key management options
 2013-09-23 18:59:02 -07:00
Matthew Williams
05b51688f6 am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 
* commit '75256476c87cc8c4f7e5124c9b944c37b2f51d3d':
  fix deadlock caused by clearAllBackoffs in SSE
 2013-09-23 18:58:55 -07:00
Svetoslav
cace0382dd am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev 
* commit 'a9f97a0a58066a29391629da85ed25a8e876dd40':
  Page ranges not correct in come cases.
 2013-09-23 18:58:46 -07:00
Dianne Hackborn
8d4816d8fc am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 
* commit 'a3abca90aea1b0b6ab0be56b3ec008b91dfc090f':
  Issue #10461551: KLP API Review: AppOpsManager
 2013-09-23 18:58:42 -07:00
Craig Mautner
e14d0c211f Merge "Ensure that activities behind keyguard are paused." into klp-dev 2013-09-23 17:46:30 +00:00
Vinit Deshapnde
662c326e5f Merge "Allow yet another combination of key management options" into klp-dev 2013-09-23 17:46:00 +00:00
Matthew Williams
75256476c8 Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 2013-09-23 17:35:16 +00:00
Baligh Uddin
2bd9b2cd6e Import translations. DO NOT MERGE 
Change-Id: Id35c7a7d478d301f9def5215ef593e02c0ca91e2
Auto-generated-cl: translation import
 2013-09-23 10:07:51 -07:00
Svetoslav
a9f97a0a58 Merge "Page ranges not correct in come cases." into klp-dev 2013-09-23 16:53:52 +00:00
Baligh Uddin
e179aa0bd2 Import translations. DO NOT MERGE 
Change-Id: I87f48309c6d7097d74cfef8dc7ab2b03bf431f83
Auto-generated-cl: translation import
 2013-09-23 09:48:42 -07:00
Dianne Hackborn
a3abca90ae Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 2013-09-23 16:36:29 +00:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager 
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
 2013-09-23 09:35:21 -07:00
Baligh Uddin
8a72458461 Import translations. DO NOT MERGE 
Change-Id: I26e4d60d81e13181feeb872b09db4c242105e34e
Auto-generated-cl: translation import
 2013-09-23 09:11:15 -07:00
Craig Mautner
10385a17cb Ensure that activities behind keyguard are paused. 
TLDR: Having a resumed activity behind keyguard can cause the keyguard
not to be dismissed.

Swiping the home button to launch Google Now causes an ASSIST intent
to be launched. The ASSIST intent starts SearchActivity which then
launches GEL. If an activity is resumed behind the keyguard when this
happens then that activity will be paused.

Because that activity is PAUSING, ActivityStackSupervisor
startActivityLocked() doesn't call dismissKeyguard() immediately.
Instead dismissKeyguard will be called later when GEL switches from
not-visible to visible. However, if the paused activity happens to be
GEL then there is never a not-visible to visible transition and
dismissKeyguard never gets called.

This fix removes an unnecessary call to resumeTopActivitiesLocked
which was causing activities behind the lockscreen to be resumed.

This fixes bug 10732489 except immediately after boot. Pausing the
initial activity if the lockscreen is visible after boot is deferred
for another CL.

Change-Id: I323262596ae41bc5a2700bae5942f6a4fba80936
 2013-09-23 09:05:15 -07:00
John Spurlock
af56853020 Keep PhoneStatusBar default constructor around. 
By keeping the entire class safe.

Change-Id: I0851ae5556243af2deb76f38500271059ffa4480
 2013-09-23 11:15:11 -04:00
Dianne Hackborn
bf00b1a5f8 am eafa9c2b: am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 
* commit 'eafa9c2b893a9c98d4bf8086b32aabc05181791a':
  Debug issue #10876433 java.lang.IllegalStateException...
 2013-09-22 16:53:10 -07:00
Dianne Hackborn
eafa9c2b89 am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 
* commit 'f9b70ab87e8f26b57ac3d8dc3b77052e747cb888':
  Debug issue #10876433 java.lang.IllegalStateException...
 2013-09-22 16:50:38 -07:00
Dianne Hackborn
f9b70ab87e Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 2013-09-22 23:48:29 +00:00
Dianne Hackborn
2be0093316 Debug issue #10876433 java.lang.IllegalStateException... 
...in ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Add more debug output to help track down what is going on.

Also fix a little problem where, when a service ANRs, if you ask to
wait and it still wasn't responding, the ANR dialog wouldn't be
shown again.

Change-Id: I5be2b1705a0a39ca2992624ae683945c5f38065d
 2013-09-22 16:46:00 -07:00
Jeff Sharkey
eb5c28993e am a817e49e: am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev 
* commit 'a817e49e0cbe773accb60fd0b3a37660695b6c0a':
  Latest UX asset drop, grid padding.
 2013-09-22 12:59:43 -07:00
Jeff Sharkey
a440a0dd64 am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev 
* commit 'b8a48da2a707720a105584f1b8dc087a6dd9c887':
  Create unique files, root ordering, UI bugs.
 2013-09-22 12:59:40 -07:00
Jeff Sharkey
a817e49e0c am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev 
* commit 'dbfceb7ea0f2925fa2e9cce4a5eece0b72d9c093':
  Latest UX asset drop, grid padding.
 2013-09-22 12:57:24 -07:00
Jeff Sharkey
b8a48da2a7 am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev 
* commit '5e1a5e5bad475696e842addceb7dd6a519879f98':
  Create unique files, root ordering, UI bugs.
 2013-09-22 12:57:20 -07:00
Jeff Sharkey
dbfceb7ea0 Merge "Latest UX asset drop, grid padding." into klp-dev 2013-09-22 19:55:34 +00:00
Jeff Sharkey
5e1a5e5bad Merge "Create unique files, root ordering, UI bugs." into klp-dev 2013-09-22 19:55:19 +00:00
Igor Murashkin
f17285c465 am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 
* commit '8c87117588a1158823d94dec365897d33cec59bf':
  camera2: Rename CameraProperties to CameraCharacteristics
 2013-09-22 09:57:40 -07:00
Igor Murashkin
8c87117588 am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 
* commit '3ba21e979524367631de70dfc82075693d9c616d':
  camera2: Rename CameraProperties to CameraCharacteristics
 2013-09-22 09:55:52 -07:00
Igor Murashkin
3ba21e9795 Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 2013-09-22 16:54:11 +00:00
Robert Greenwalt
7dadd1ed2f am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev 
* commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a':
  Fix BatchScan request coalesing
 2013-09-22 09:03:20 -07:00
Robert Greenwalt
1e690b693c am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev 
* commit '0983eadff23bfc3ab7812be455d4a66edc3dcc7b':
  Fix BatchScan request coalesing
 2013-09-22 09:01:43 -07:00
Robert Greenwalt
0983eadff2 Merge "Fix BatchScan request coalesing" into klp-dev 2013-09-22 15:59:01 +00:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics 
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
 2013-09-21 21:01:32 -07:00
Igor Murashkin
b960357438 am 78d5286e: am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev 
* commit '78d5286e0711092d1ec919c4524bfba9230d11d0':
  camera2: Add capture sequences and capture failures
 2013-09-21 19:54:14 -07:00
Igor Murashkin
78d5286e07 am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev 
* commit 'ca833c389b3cc2f95f27fe7782d0bebb8b36d660':
  camera2: Add capture sequences and capture failures
 2013-09-21 19:49:34 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Jeff Sharkey
1feeddf518 Latest UX asset drop, grid padding. 
Bring in latest asset drop.  Apply grid padding programmatically
instead of waiting for asset.  Remove alpha from directory animation.

Update save footer background to match spec.

Bug: 10700025
Change-Id: I8eef08f36d04767b78e91b23f72bdbebfbb02f58
 2013-09-21 15:26:37 -07:00
Wink Saville
4d154af68f am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict 
* commit '86ad8e6871e778e1ee47d4f723bbd1d5f8fc00bf':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 14:39:42 -07:00
Wink Saville
86ad8e6871 am 56065891: Merge commit \'53221120\' into fix-merge-conflict 
* commit '56065891abf383b0409ae595437dcb0ea132e32b':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 14:36:13 -07:00
Jeff Sharkey
5545f56f75 Create unique files, root ordering, UI bugs. 
When a file already exists on disk, try adding a counter suffix to
make a unique name.  Move services near top of roots list, just below
recents.  Remove "Documents" root.

Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.

When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.

Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.

Fix UI bug around trailing breadcrumbs.  Fix bug that dropped Recents
from roots list.  Add up action to Settings activity.  Give our
activity a default icon while waiting for async roots to load.

Bug: 10818683, 10819461, 10819461, 10819196, 10860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831
 2013-09-21 14:07:16 -07:00
Wink Saville
56065891ab Merge commit '53221120' into fix-merge-conflict 
* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
 2013-09-21 11:52:42 -07:00
Wink Saville
5322112004 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) 
* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 11:33:53 -07:00