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

113443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
d4aa10d5be am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit 'c3414dc4baf2bb2c3ef5761912fea7f44d804ebc':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:22:22 -07:00
Flavio Lerda
9df07d19e3 am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit '3f36b33dca0c1c9599c81b273e88b85d0e6fb06e':
  Document the order of values returned by keyAt().
 2013-09-12 09:22:18 -07:00
Jeff Brown
e5ac84517d am a0908665: am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit 'a090866557b207efc62197cf7625320babdcaed9':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:22:16 -07:00
Baligh Uddin
2c75bac2de am 0b5fa44b: (-s ours) am 4dff9868: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0b5fa44b246b2cf16f2dc5eea1a09c7a53f6efcd':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:13 -07:00
Baligh Uddin
b6b1872352 am d55c00c9: (-s ours) am c57bd8b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd55c00c93c36358b8dd8abe2d196ef222877db67':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:11 -07:00
Baligh Uddin
d32c8bda1a am 8432e5f0: (-s ours) am 0792054f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8432e5f05c827d48727904996d49086c81ad9562':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:08 -07:00
Alex Ray
f004b0d593 am 0417baa5: am c333a3f7: Merge "consumer_ir: add length to get carrier freqs" into klp-dev 
* commit '0417baa5366e8d11b6ea3f2e1ef14290a99af486':
  consumer_ir: add length to get carrier freqs
 2013-09-12 09:22:03 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00
Jeff Brown
a090866557 am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit '737d2c0b92b69d9069de6fe0e2785676b9a10d78':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:16:57 -07:00
Baligh Uddin
0b5fa44b24 am 4dff9868: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4dff98689d4c5f98159206730074aaa6463ada23':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:55 -07:00
Baligh Uddin
d55c00c93c am c57bd8b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c57bd8b9962a87282aef4bf367c33238f1d7c46e':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:52 -07:00
Baligh Uddin
8432e5f05c am 0792054f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0792054f6b94986ed72df4f7fb8e775d8b916946':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:49 -07:00
Alex Ray
0417baa536 am c333a3f7: Merge "consumer_ir: add length to get carrier freqs" into klp-dev 
* commit 'c333a3f7c6bf838aad2a2419ea65167e344f0cab':
  consumer_ir: add length to get carrier freqs
 2013-09-12 09:16:46 -07:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
Flavio Lerda
b25cfdf1ec Merge "Document the order of values returned by keyAt()." into klp-dev 2013-09-12 11:49:29 +00:00
Primiano Tucci
14a2d2fbe6 Merge "Adding freeMemoryForTests static method to WebView." 2013-09-12 11:04:07 +00:00
Primiano Tucci
2442675002 Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
 2013-09-12 10:58:29 +01:00
Jeff Brown
737d2c0b92 Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 2013-09-12 04:03:31 +00:00
Baligh Uddin
6304f68dfd Merge "Import translations. DO NOT MERGE" 2013-09-12 02:47:14 +00:00
Baligh Uddin
541db90bf7 Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:19 +00:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
1d7d66fe9d Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:08 +00:00
Baligh Uddin
629b37fb0e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:58 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
1d6c7990ba Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:24 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Baligh Uddin
7b476f598e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:08 +00:00
Alex Ray
c333a3f7c6 Merge "consumer_ir: add length to get carrier freqs" into klp-dev 2013-09-12 01:55:27 +00:00
Selim Gurun
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Alex Ray
2cfb6826c3 am 6d6c5de1: am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '6d6c5de165ab99b1c8e131425f51c2ac749312e0':
  consumer ir: clarify @link in documentation
 2013-09-11 17:46:42 -07:00
Alex Ray
6d6c5de165 am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '03ad7ae1bc406dbdb452cb5f91f2bde1848fd4cb':
  consumer ir: clarify @link in documentation
 2013-09-11 17:42:53 -07:00
Alex Ray
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs. 
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
 2013-09-11 17:33:52 -07:00
Xia Wang
486ad2a7ba am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit '6c2ad7ac97ecc23525ff5ad499edaa9316c230e9':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:31:04 -07:00
Lajos Molnar
c4eae8ec47 am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 
* commit '5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
 2013-09-11 17:31:00 -07:00
Xia Wang
6c2ad7ac97 am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit 'b32a80425db68f67ecafb89093e01e7c1d75770b':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:26:09 -07:00
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
 2013-09-11 17:25:05 -07:00
Eino-Ville Talvala
1663033d96 am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'fb09a7381992c6ca88b35d3d0103b38051174928':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:24:56 -07:00
Ruben Brunk
b78b4af70d am fae16ab3: am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit 'fae16ab39fe651f97bf86e6f5fe07f95342450aa':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:24:49 -07:00
Elliott Hughes
16a584096a am 2df0f9ed: am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit '2df0f9ed82f9dab253d2359df12b119ed36af522':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 17:24:43 -07:00
Amith Yamasani
05a1278ea4 am 2861921c: am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit '2861921c2433867679bd7bd1bb674239eb0afa50':
  Change selection highlight for intent disambig dialog
 2013-09-11 17:24:39 -07:00
Chong Zhang
0b8dd03313 am 1c6835a2: am bcb97996: Merge "Pass subtitle track properties to SubtitleController" into klp-dev 
* commit '1c6835a28a03409eb6f3368b2466993fb993c7a6':
  Pass subtitle track properties to SubtitleController
 2013-09-11 17:24:35 -07:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00:00
Mindy Pereira
3878b78631 am 21497c5f: am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-dev 
* commit '21497c5f5d6ed3ddf90cf48c5a21b7f7de1f91b5':
  Scale feels too quick in relation to movement
 2013-09-11 17:24:30 -07:00
Kenny Root
b203dc138e am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit 'efbfe81d2607221170a7fcb1d22a82c198e789f4':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 17:24:17 -07:00
Zhijun He
ed3544a695 am 10ccc326: am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit '10ccc3266e5e66a49a0c64678936fb0402b93c4a':
  ImageReader: Skip size check for BLOB format
 2013-09-11 17:24:00 -07:00