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

174598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
29e12f25d8 am c229c393: am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev automerge: 14b9092 
* commit 'c229c3935c2b3b3ccee459d84b81d9c84ac8b3ca':
  Convert record channel mask for dynamic mix
 2014-11-21 02:58:20 +00:00
Chris Craik
08dc405ecd am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev automerge: 5b41215 
* commit '0d6512a8dd398e5eea79744ce4541664041dfdb8':
  Improve ColorMatrix docs
 2014-11-21 02:58:11 +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
Eric Rowe
64865e05d4 am 496c6703: am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev automerge: 3b442e2 
* commit '496c67031bea7c50450d5d55a2f8e4b57f9185bf':
  Fix wifi reconnection tests.
 2014-11-21 02:57:33 +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
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
Craig Mautner
71fcc205da am 3985b44b: am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev automerge: 8d1ab6f 
* commit '3985b44b20d9ab58ea0d29dbd605436df135861e':
  Use package name as custom resolver process name
 2014-11-21 02:56:40 +00:00
Jean-Michel Trivi
c229c3935c am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 
automerge: 14b9092

* commit '14b909241fe4f43ca481e9cd367dd641fe395ff1':
  Convert record channel mask for dynamic mix
 2014-11-21 02:49:43 +00:00
Chris Craik
0d6512a8dd am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev 
automerge: 5b41215

* commit '5b41215b1647d9673b1231d046736c8e0590fa8a':
  Improve ColorMatrix docs
 2014-11-21 02:48:35 +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
Eric Rowe
496c67031b am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev 
automerge: 3b442e2

* commit '3b442e23d859e84fe0550242257294c0b1e37438':
  Fix wifi reconnection tests.
 2014-11-21 02:43:06 +00:00
Adam Lesinski
68976003f0 am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6 
* commit '36671b925c6b5b9e547561c5bacf3419cf71897f':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:42:23 +00:00
Eric Rowe
97bc736e34 am 37368d7a: am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev automerge: d2fd1bd 
* commit '37368d7ae493ad39c5ec8bb70afe64fcb0f6c31f':
  Fix wifi tethering tests.
 2014-11-21 02:42:18 +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
Craig Mautner
3985b44b20 am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev 
automerge: 8d1ab6f

* commit '8d1ab6f2002d65dd351b0affd86cdfdbc27fd0fa':
  Use package name as custom resolver process name
 2014-11-21 02:38:20 +00:00
Adam Lesinski
36671b925c am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:36:57 +00:00
Eric Rowe
37368d7ae4 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
automerge: d2fd1bd

* commit 'd2fd1bd9d631e822b03bfabd41853cc3075f61bf':
  Fix wifi tethering tests.
 2014-11-21 02:35:36 +00:00
Alan Viverette
4d6b1549a7 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
automerge: aed1268

* commit 'aed12685b0e6e8146f3f22f5c938a4e3d6ca9b38':
  Move default token handling into WindowManagerImpl
 2014-11-21 02:23:47 +00:00
Alan Viverette
d250fc5915 am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
automerge: 16c5d25

* commit '16c5d2547b1fc1e15f6d2b62bf5c8c706506a16e':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 02:22:40 +00:00
Jae Seo
9581094970 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
automerge: cfaac8d

* commit 'cfaac8d1549430cc89e704602504413a5d59352c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-21 02:21:15 +00:00
Jae Seo
d97dc701ba am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
automerge: 7d97be9

* commit '7d97be9dbc8c220fa56e3665deb9b978a12ed71a':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-21 01:59:00 +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
Winson Chung
a0715af6b1 am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
automerge: 4ddbed3

* commit '4ddbed3d1fd569c41d0a64b3c37447cde572b36a':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 01:56:39 +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
3b35226300 am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
automerge: 5b01f08

* commit '5b01f0894dacec272ce02fe07e879369ecd2ed93':
  Add new empty app test entry points.
 2014-11-21 01:53:27 +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
Martijn Coenen
51041cb7da am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
automerge: 0d4a4e6

* commit '0d4a4e6e59267ed58d9fe44303e400877aa1caab':
  Verify NFC permission immediately on API calls.
 2014-11-21 01:51:04 +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
RoboErik
fdc7f747f2 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
automerge: 216c089

* commit '216c089834e92733055a17bcade7ca1971677b49':
  Scale bitmaps in metadata sent to the system
 2014-11-21 01:48:44 +00:00
Shishir Agrawal
3e8a9053dc am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
automerge: 84b988e

* commit '84b988e6eea690c33e5f08b3a7f41d3a8cd8d912':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 01:47:25 +00:00
Alan Viverette
aed12685b0 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
  Move default token handling into WindowManagerImpl
 2014-11-21 01:38:26 +00:00
Alan Viverette
16c5d2547b am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '05275a2cbd2f31dbb098dc45a79379f1b7b964db':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 01:38:21 +00:00
Jae Seo
cfaac8d154 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
* commit '12c03e3386db46f2452dd7642771adad1d03ce5c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-21 01:37:51 +00:00
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master. 
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
 2014-11-20 17:27:36 -08:00
Jae Seo
7d97be9dbc am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
* commit '91ab2665ed73a37ac9dda52e7d440784b1d1011e':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-21 00:44:27 +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
Winson Chung
4ddbed3d1f am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit 'de04d5573af33aa4357ec2e97708f07c30265333':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 00:44:15 +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
5b01f0894d am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
* commit '42d9bf665598ae316bfae3fd28cbb5c8f2c95824':
  Add new empty app test entry points.
 2014-11-21 00:43:57 +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
Martijn Coenen
0d4a4e6e59 am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
* commit 'a603f083ff8dbbc5ed2803d8f402accac135d891':
  Verify NFC permission immediately on API calls.
 2014-11-21 00:43:45 +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
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
 2014-11-21 00:43:33 +00:00
Shishir Agrawal
84b988e6ee am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 00:43:23 +00:00
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00