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

21060 Commits

Author SHA1 Message Date
Christopher Tate
b2b8dcba2c am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
  Recents backup helper
 2014-11-21 02:30:11 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Erik Kline
dedd42a2bd am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 00:10:12 +00:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Craig Mautner
9bb16f55e8 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
* commit '25418aabb687b39a9e5bbe7c387bfcb81bde1222':
  Ensure arraylist index is montonically decreasing
 2014-11-20 20:57:22 +00:00
Craig Mautner
25418aabb6 Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 2014-11-20 20:53:36 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper 
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
 2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Wink Saville
1caab41f31 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
* commit '816e19eb6d5795f98f072494c763b20fe3412c30':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-20 20:38:40 +00:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
68c21d6736 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4a57e908177c86819ade1ebb813677698f1a526a':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:23:17 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Craig Mautner
7b4655dbbe Ensure arraylist index is montonically decreasing 
A previous fix for IndexOutOfBoundsException (ag/584621) left a
situation where the index would not decrement if the arraylist
size didn't change. The size doesn't change if the window being
removed is animating away. That caused window manager to remain
in an infinite loop within removeAllWindows.

This change ensures that the index diminishes each pass through
the loop and doesn't exceed the bounds of the arraylist.

Fixes bug 18362246.

Change-Id: Ibca70d95622f3b152ede14857f0e913099dc7b88
 2014-11-20 12:13:22 -08:00
Jae Seo
89d8fb555a am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '7edaf55aab6fb14a640904015e10e2f5c9299423':
  TIF: fix setSurface() logic
 2014-11-20 18:54:52 +00:00
Jae Seo
7edaf55aab Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 2014-11-20 18:51:32 +00:00
Geoffrey Borggaard
c2af9be62c am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'bfab323cb59f2ff4a1ed64a22a5d0c2434e302c1':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-20 18:50:38 +00:00
Geoffrey Borggaard
bfab323cb5 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 2014-11-20 18:44:49 +00:00
Dianne Hackborn
42fec57f3a am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit 'd9968438bcf439e7a8c6058a95b85286a632dc1c':
  Fix issue with call backs from media process.
 2014-11-20 18:33:34 +00:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
RoboErik
3ef3a9bff3 am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit 'ac4af18bbb077a89696260e595fc130d9c172f79':
  Handle volume events on master volume devices correctly
 2014-11-20 18:04:59 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
Geoffrey Borggaard
b66252fb42 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
(cherry picked from commit ba45b96a378623e3392da65e81e67dabdf4f0678)
 2014-11-20 15:39:23 +00:00
Wonsik Kim
b429c01558 am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
* commit '59d3669512b4fdff262ec6fe2760c9ae967eca95':
  TIF: set audio gain properly
 2014-11-20 07:07:51 +00:00
Wonsik Kim
59d3669512 Merge "TIF: set audio gain properly" into lmp-mr1-dev 2014-11-20 07:04:25 +00:00
Wonsik Kim
102670f16a TIF: fix setSurface() logic 
Bug: 18457632
Change-Id: I8c25a355c71b5f820a1599fd365e5ae62a9a5eeb
 2014-11-20 15:09:13 +09:00
Erik Kline
90e9307e8f Rename EXTRA_NETWORK ConnectivityManager constants. 
Per b/18414703:

    s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
    s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g

Additionally, associated string values updated to:

    android.net.extra.NETWORK
    android.net.extra.NETWORK_REQUEST

Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe
 2014-11-20 13:16:31 +09:00
Wale Ogunwale
005080e5f8 am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 01:49:37 +00:00
Wale Ogunwale
70273e05b2 Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 2014-11-20 01:46:28 +00:00
Wonsik Kim
71dfa96f53 TIF: set audio gain properly 
Bug: 18392706
Change-Id: I56c21c156a54e7d6dcf787f6b3ab4b901843b922
 2014-11-20 09:54:36 +09:00
Wale Ogunwale
1f4c02bb18 Stop activity onVisibleBehindCanceled() 
Once an activity is no longer visible behind and has released
its background resources, it is added to the list of activities
that can be stopped, but not actually stopped until the next
major event (like another activity starting). We now schedule
the idle processing once the background resources have been
released so the activity can be stopped as soon as possible.

Bug: 18191707
Change-Id: I472eee949c1a78b4d944454463f03c90e7d2618b
 2014-11-19 16:25:51 -08:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Jinsuk Kim
0beb76e108 am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Sharkey
c5efb2b92a am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
  Speed up GrantUri.hashCode().
 2014-11-19 00:14:51 +00:00
Jinsuk Kim
86a1e5a16e CEC: Use thread-safe version for avr info 
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.

Bug: 18426137

Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
 2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88 Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 2014-11-19 00:09:51 +00:00
Christopher Tate
f066bf229c am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
  Prevent some alarm pathologies
 2014-11-19 00:09:50 +00:00
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:09:43 +00:00
Rubin Xu
0122db0a63 am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:09:38 +00:00
Christopher Tate
04eb368d03 Merge "Prevent some alarm pathologies" into lmp-mr1-dev 2014-11-18 23:49:54 +00:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00