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

23317 Commits

Author SHA1 Message Date
Geoffrey Borggaard
9a5974734f am e400f811: am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e400f811f28fbf8b6055b9efc8afbee11ba08f67':
  Fix null handling in proxies.
 2014-11-21 12:20:00 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
Geoffrey Borggaard
e400f811f2 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
 2014-11-21 10:31:03 +00:00
Geoffrey Borggaard
8a2ac41dcf am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e548c3a3786a252d42b3c0ae0823f4718fcb9718':
  Fix null handling in proxies.
 2014-11-21 10:25:37 +00:00
Geoffrey Borggaard
e548c3a378 am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
 2014-11-21 10:17:39 +00:00
Christopher Tate
5b0528b5e1 am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
  Recents backup helper
 2014-11-21 03:09:06 +00:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Craig Mautner
b1ff9cc788 am 117f0c15: am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev automerge: 9bb16f5 
* commit '117f0c15f7d534afeed20d8e14be8a83f8062f72':
  Ensure arraylist index is montonically decreasing
 2014-11-21 02:57:38 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Erik Kline
30246e3d37 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 02:57:09 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Craig Mautner
117f0c15f7 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
automerge: 9bb16f5

* commit '9bb16f55e80afaeb6700af9fc97a58a8b3309412':
  Ensure arraylist index is montonically decreasing
 2014-11-21 02:44:31 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
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
Jae Seo
1c10503c4c am 89d8fb55: am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
automerge: 71bda35

* commit '71bda351510330c1a6c21474f518fa2f53bf4794':
  TIF: fix setSurface() logic
 2014-11-21 01:57:46 +00:00
Geoffrey Borggaard
6c70cde9d2 am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
automerge: aba9aba

* commit 'aba9abaefabf9b78c3df4b0ce01aa52184b34764':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 01:55:15 +00:00
Dianne Hackborn
f8c3691425 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.
 2014-11-21 01:52:23 +00:00
RoboErik
24228295e2 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
automerge: bbf0f66

* commit 'bbf0f662a8a54e6c8c49a58b7a7273fe8756ff45':
  Handle volume events on master volume devices correctly
 2014-11-21 01:49:48 +00:00
Jae Seo
71bda35151 am 89d8fb55: am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '89d8fb555a165d353fc515922d9851dc131e0c1b':
  TIF: fix setSurface() logic
 2014-11-21 00:44:21 +00:00
Geoffrey Borggaard
aba9abaefa am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'c2af9be62c4a8d5da6396c419413e1193c34928e':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:44:09 +00:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
 2014-11-21 00:43:51 +00:00
RoboErik
bbf0f662a8 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit '3ef3a9bff37d2fbe216110e025f683923c58ddba':
  Handle volume events on master volume devices correctly
 2014-11-21 00:43:39 +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
Wonsik Kim
a6b1bf2394 am fa8276c3: am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev automerge: b429c01 
* commit 'fa8276c3edb1b71d8e49bb8be1066e86a0d8abb2':
  TIF: set audio gain properly
 2014-11-20 21:29:27 +00:00
Wale Ogunwale
892d43bad6 am 1e910d17: am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev automerge: 005080e 
* commit '1e910d17cef3ef21c09ead282b829ab7bb7bdedb':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 21:24:09 +00:00
Wonsik Kim
fa8276c3ed am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
automerge: b429c01

* commit 'b429c01558c65b12e2c4ebec59f146e86aa460bb':
  TIF: set audio gain properly
 2014-11-20 21:22:45 +00:00
Wale Ogunwale
1e910d17ce am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
automerge: 005080e

* commit '005080e5f8c3cfd7918bb9a62e36384d6a08351e':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 21:17:45 +00:00
Geoffrey Borggaard
90ed95faed am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
 2014-11-20 20:59:00 +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