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

106098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2b6daf130a am 0ba3d91f: am 05759d15: Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev 
* commit '0ba3d91f2da7773492739aad267d6d825d1465fd':
  add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126
 2013-05-07 10:18:42 -07:00
Jesse Hall
ce3fe5fd8a am 4d32a367: am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev 
* commit '4d32a36759b619abdda9c895054f513aef3a3f03':
  Register EGLExt JNI methods
 2013-05-07 10:18:38 -07:00
Kenny Root
1d69bad411 resolved conflicts for merge of a98b0ff8 to master 
Change-Id: I1f4a952d360c48426e22a7772726b6867cc19771
 2013-05-07 10:14:46 -07:00
Christopher Tate
1d41cae973 am 1bc3e39a: am 06548798: am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '1bc3e39ab48936bf82b8c11688ba0939e0866a44':
  Ensure install-during-restore is like install-then-restore
 2013-05-07 10:01:28 -07:00
Kenny Root
ae062e0a02 am 5f851a89: am cd1de394: Merge "Track change in NativeCrypto" 
* commit '5f851a89b6a90db206d0e2fa63a60229e2bfcda6':
  Track change in NativeCrypto
 2013-05-07 10:01:24 -07:00
Christopher Tate
ec28e4b588 am 5f714213: am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev 
* commit '5f714213546d667ac241a92e2052b30dabef8355':
  Ensure install-during-restore is like install-then-restore
 2013-05-07 10:01:09 -07:00
Elliott Hughes
977b2531ae am 4cd60897: am 601afaef: Merge "Someone\'s IDE chose the wrong Date." 
* commit '4cd60897c73ddd67d7f267432073363cbf75371e':
  Someone's IDE chose the wrong Date.
 2013-05-07 10:01:04 -07:00
Kenny Root
add582122d resolved conflicts for merge of 485d7a31 to master 
Change-Id: I058e19af8732df44457bdc614ee810a642dc25e4
 2013-05-07 09:51:31 -07:00
Kenny Root
cfba6a07fd Track change in NativeCrypto 
(cherry picked from commit 4b30e3391bda250975b43af43bad58c98fa73f84)

Change-Id: I9eed3895d78c6906f7d29d325075cf1df48fd123
 2013-05-07 00:44:18 -07:00
Scott Main
0ba3d91f2d am 05759d15: Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev 
* commit '05759d1531f4e36b51f386fa884454eeda88ecb8':
  add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126
 2013-05-06 17:06:40 -07:00
Scott Main
05759d1531 Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev 2013-05-06 23:56:41 +00:00
Jesse Hall
4d32a36759 am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev 
* commit '2787ba25fdc4141e74e649922cf982d3f6c0168d':
  Register EGLExt JNI methods
 2013-05-06 16:48:19 -07:00
Dianne Hackborn
a98b0ff812 am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev 
* commit 'd43a71dad80dfca65b0758f4333360516f6ad300':
  Help for the debugging help for issue #8734824.
 2013-05-06 16:48:16 -07:00
Jesse Hall
2787ba25fd Merge "Register EGLExt JNI methods" into jb-mr2-dev 2013-05-06 23:47:17 +00:00
Dianne Hackborn
d43a71dad8 Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev 2013-05-06 23:46:57 +00:00
Dianne Hackborn
26ef95f0c1 Merge "Add new app ops for various interesting audio service things." 2013-05-06 23:32:58 +00:00
Baligh Uddin
140b9b68ee am 966b340e: (-s ours) am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '966b340e7d18b78c74a07379bbd08a426e84d8ce':
  Import translations. DO NOT MERGE
 2013-05-06 16:20:32 -07:00
Robert Greenwalt
5dd3f51a19 am 8c04cd04: am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev 
* commit '8c04cd041dfc96ef4af662d50aad63d998314d27':
  Fix sync problem in NsdManager
 2013-05-06 16:20:30 -07:00
Michael Jurka
f3ff4d6d80 am 664f785e: am 72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev 
* commit '664f785e2c8697aa31fa69b9a109c09a99a2d50b':
  Fix bug where thumbnails in Recents disappear
 2013-05-06 16:20:27 -07:00
Dave Burke
8d05a666fd am 38996cdc: (-s ours) am 236cc476: Temporarily revert field name change (DO NOT MERGE) 
* commit '38996cdcf11e46ea510795e99b0a21303d579218':
  Temporarily revert field name change (DO NOT MERGE)
 2013-05-06 16:20:25 -07:00
Dirk Dougherty
589854346f am db4f24a6: am 96f69cbe: am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services. 
* commit 'db4f24a6c75e38c21f8c436febabfd5eea6065d8':
  Doc change: Update landing pages for Google Play Services.
 2013-05-06 16:20:22 -07:00
Jesse Hall
f986f0f590 Merge "resolved conflicts for merge of 78df7b5e to master" 2013-05-06 23:19:26 +00:00
Craig Mautner
c87a732e75 Merge "Call ensureActivitiesVisibleLocked from supervisor." 2013-05-06 23:13:12 +00:00
Dianne Hackborn
ba50b97cff Add new app ops for various interesting audio service things. 
Media buttons: note when an application tries to take ownership
of the media buttons.
Audio focus: note when an application tries to take audio focus.
Volume levels: note changes to the volume level of the various
streams.

Maybe we should also have some ops for muting streams, soloing
streams, etc?

Change-Id: I79a5d477b0bad4ff61486cdb73ffb1196a674964
 2013-05-06 16:12:12 -07:00
Dianne Hackborn
8bd64df2ad Help for the debugging help for issue #8734824. 
Add a new "hang" am command that lets you hang the system
process.  Useful for testing.

Change-Id: Ice0fc52b49d80e5189f016108b03f9fd549b58a7
 2013-05-06 16:07:26 -07:00
Jesse Hall
9ee0999bcb resolved conflicts for merge of 78df7b5e to master 
Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5
 2013-05-06 16:04:53 -07:00
Christopher Tate
1bc3e39ab4 am 06548798: am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '06548798f5b03b552d27e956da094effb70ee570':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:21:04 -07:00
Christopher Tate
06548798f5 am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '2ad68f7d261a1dbc749f6e322b1e84a1288087bd':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:19:41 -07:00
Christopher Tate
2ad68f7d26 am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '04d6141033c66a1777ba0c66d67a7540e4c3e89c':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:17:36 -07:00
Christopher Tate
04d6141033 am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:16:03 -07:00
Christopher Tate
dfb33b860f am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:14:27 -07:00
Kenny Root
5f851a89b6 am cd1de394: Merge "Track change in NativeCrypto" 
* commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2':
  Track change in NativeCrypto
 2013-05-06 15:13:58 -07:00
Christopher Tate
fcfc99c064 am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'f7918b4a1e06350ba4d69fe47327db830cd4e8ba':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:12:07 -07:00
Kenny Root
cd1de3940d Merge "Track change in NativeCrypto" 2013-05-06 22:02:20 +00:00
Kenny Root
4b30e3391b Track change in NativeCrypto 
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
 2013-05-06 15:00:58 -07:00
Christopher Tate
f7918b4a1e am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:00:53 -07:00
Christopher Tate
d3a57029e8 am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:59:40 -07:00
Christopher Tate
1b0c9c95dc am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:53:10 -07:00
Christopher Tate
81c1d8d3a5 Ensure install-during-restore is like install-then-restore 
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
 2013-05-06 14:43:05 -07:00
Christopher Tate
5f71421354 am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev 
* commit 'e242c731f2288a615d54f329cdeb16157d4c15ea':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:25:10 -07:00
Christopher Tate
e242c731f2 Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev 2013-05-06 21:12:41 +00:00
Elliott Hughes
4cd60897c7 am 601afaef: Merge "Someone\'s IDE chose the wrong Date." 
* commit '601afaef5220aef928a9235e50376c462538a942':
  Someone's IDE chose the wrong Date.
 2013-05-06 14:04:34 -07:00
Romain Guy
72bd95b8fe am b90ff505: am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" into jb-mr2-dev 
* commit 'b90ff505df143abd957cfc19b60727e3460ee68c':
  Convert alpha from [0..1] to [0.255] range Bug #8808886
 2013-05-06 13:56:23 -07:00
Chet Haase
94268b0dd9 am 33be275d: am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-dev 
* commit '33be275deb072ca3e6155b61370578b16dbee64a':
  Fix scaled-view droppings artifact
 2013-05-06 13:56:20 -07:00
Fabrice Di Meglio
7caa1a87fe am a8549041: am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev 
* commit 'a8549041ccdf38f8ddbdc5fc2bce84d737a89a7e':
  Optimize RTL properties resolution
 2013-05-06 13:56:17 -07:00
Svetoslav
100ed154b7 am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev 
* commit 'b0675df8fd377230edc392e02ba0eba275b57992':
  Idle maintenance scheduling broken.
 2013-05-06 13:56:14 -07:00
Dianne Hackborn
485d7a31a8 am 5b88a2fd: Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESS 
* commit '5b88a2fd7b77880f6e09ae4a1de509bebe28bc3a':
  Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESS
 2013-05-06 13:47:04 -07:00
Elliott Hughes
601afaef52 Merge "Someone's IDE chose the wrong Date." 2013-05-06 20:29:09 +00:00
Craig Mautner
b59dcfd5e1 Call ensureActivitiesVisibleLocked from supervisor. 
- Don't call ActivityStack.ensureActivitiesVisibleLocked directly.
Instead call ActivityStackSupervisor.ensureActivitiesVisibleLocked.

- Add detecting monochrome screenshots to black screenshots.

- minor refactors.

Change-Id: I050b1cd40cacaab451f1460a77a82125a8077ff2
 2013-05-06 13:12:58 -07:00
Christopher Tate
2baf6dcfcf Ensure install-during-restore is like install-then-restore 
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

Change-Id: Ifa1b5877673a0d6ca6acf94e60f314fd0dda008c
 2013-05-06 13:10:21 -07:00