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

113853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
destradaa
9d820c5832 am 55a70777: am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 
* commit '55a707775681e3a51d98f4c8aaf15be074c52ce8':
  Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information
 2013-09-11 17:23:49 -07:00
Adam Powell
a395e70109 am 18149fcf: am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '18149fcf86eee3335b28b2c2373b585c4e18745a':
  Action bar refactoring and transitions
 2013-09-11 17:23:37 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 17:23:29 -07:00
Kenny Root
317c602f0e am d9141d93: am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'd9141d939eff2e53c95f92a6a2c34116fd7a868b':
  Reconcile differences between zip implementations
 2013-09-11 17:23:15 -07:00
Tom O'Neill
67ecfe7b48 am 0494832f: am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 
* commit '0494832fc633b72951fd6faeff342ce23d2ecae4':
  Improve some javadoc related to isProviderEnabled() apis
 2013-09-11 17:23:09 -07:00
Santos Cordon
e7f6bfbc51 am 07d545e0: am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '07d545e08d615865860a0f73b7eabfd149754893':
  Add permissions for the InCallUI Split.
 2013-09-11 17:23:04 -07:00
Alexander Ray
4c980cc6ae am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit 'b0049151f7c1f2ffa7481ac7c6f6baf7a548c5e8':
  Add consumer IR framework
 2013-09-11 17:23:01 -07:00
Sandeep Siddhartha
6f64688bc8 am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs
 2013-09-11 17:22:55 -07:00
Igor Murashkin
33069f40e5 am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '47869404cb8233c536a0a5d2c5ce4d0089e39882':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 17:22:40 -07:00
Victoria Lease
2805ec5753 am 5d345dbe: am 444ae3a2: Merge "include Padauk in fallback chain" into klp-dev 
* commit '5d345dbe31a7136702e7e126a16ecfdae1ca5738':
  include Padauk in fallback chain
 2013-09-11 17:22:38 -07:00
Amith Yamasani
b5dec6a606 am dd9157ce: am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'dd9157ce314f3b8d20f6b65a6f9dbf00acbe7ea1':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 17:22:35 -07:00
Dianne Hackborn
7c3c23114b am 33f92b6f: am c1cf491d: Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit '33f92b6fe249db2ae822c6702955c7b987ff87f9':
  More on issue #10130785: Restore silence and vibrate settings...
 2013-09-11 17:22:26 -07:00
Kenny Root
4945409031 am 4a0be803: am b5f694f6: Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 
* commit '4a0be803a9414bf95553999e2a0504311a346a8b':
  Revert "Reconcile differences between zip implementations"
 2013-09-11 17:22:23 -07:00
Lajos Molnar
5481e5fe30 am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 
* commit '03cd51cd17989b4167b357b36fe337b75e2cafd6':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
 2013-09-11 17:21:32 -07:00
Lajos Molnar
03cd51cd17 Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 2013-09-12 00:19:17 +00:00
Jonathan Dixon
fcb17d0375 resolved conflicts for merge of 42513ca1 to master 
frameworks/base/tools was move to frameworks/tools in
I3ffafdab27cc4aca256c3a5806b630795b75d5c8)

Conflicts:
	tools/layoutlib/bridge/src/android/webkit/WebView.java

Change-Id: Idc834b0e1a4bd0d6b2c5cf6de137e45f07da4344
 2013-09-11 17:18:16 -07:00
Eric Laurent
e33b79ef37 am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit '95a181397dad3113b96e3cc7392a5b0f5d742f39':
  Add HOTWORD as an AudioSource
 2013-09-11 17:17:50 -07:00
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00:00
Eino-Ville Talvala
fb09a73819 am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'ede3eeb72c9708df023bdfb369905ededd1ebb06':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:10:36 -07:00
Eino-Ville Talvala
ede3eeb72c Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-12 00:08:04 +00:00
Ruben Brunk
fae16ab39f am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit '91019c9ef34b2fb00a1c027a57d75ed9e0810df5':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:05:48 -07:00
Elliott Hughes
2df0f9ed82 am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit '442a8753a0f312439e2ef233c041d9d584768749':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 17:02:20 -07:00
Ruben Brunk
91019c9ef3 Merge "Remove dependency on JNIHelp header side effects." into klp-dev 2013-09-12 00:01:28 +00:00
Amith Yamasani
2861921c24 am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit 'bdd06c0a13a7d4c55d6b250ebbe8eeb9d1288b7c':
  Change selection highlight for intent disambig dialog
 2013-09-11 16:58:43 -07:00
Chong Zhang
1c6835a28a am bcb97996: Merge "Pass subtitle track properties to SubtitleController" into klp-dev 
* commit 'bcb97996eb6e5ef257c6f4418ce49ff410002471':
  Pass subtitle track properties to SubtitleController
 2013-09-11 16:58:40 -07:00
Amith Yamasani
bdd06c0a13 Merge "Change selection highlight for intent disambig dialog" into klp-dev 2013-09-11 23:56:44 +00:00
Elliott Hughes
442a8753a0 am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit 'c3415a918df78715db756f02d8c55a1e7ab94244':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 16:52:01 -07:00
Chong Zhang
bcb97996eb Merge "Pass subtitle track properties to SubtitleController" into klp-dev 2013-09-11 23:51:45 +00:00
Martijn Coenen
7b0b2643eb am ae8b57a5: am b7e5692b: Merge "Add support for loading banners from HCE services." into klp-dev 
* commit 'ae8b57a5f3e6651ea272f589eb6dd78f4ff2fc68':
  Add support for loading banners from HCE services.
 2013-09-11 16:49:14 -07:00
Elliott Hughes
c3415a918d Merge "Remove ArpPeer; dead code from Google TV." 2013-09-11 23:48:34 +00:00
Dianne Hackborn
7f1a42199e Merge "resolved conflicts for merge of 03422d26 to master" 2013-09-11 23:48:18 +00:00
Dianne Hackborn
8d717b917c resolved conflicts for merge of 03422d26 to master 
Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
 2013-09-11 16:43:22 -07:00
Matthew Williams
c0b9bba53a Merge "Fix deadlock occurring on account add in SyncManager." 2013-09-11 23:40:52 +00:00
Matthew Williams
7a2ab3a060 Fix deadlock occurring on account add in SyncManager. 
deadlock caused by autosync from changing sync settings.
Some minor refactoring of the function that caused the deadlock
Bug: 10666901
Change-Id: I7cf901b1954e59dbb0bc71a5de23117353b460b1
 2013-09-11 23:40:17 +00:00
Mindy Pereira
21497c5f5d am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-dev 
* commit 'af2d8bbdbd9fdbcf109949ec18dc2bb2312b5744':
  Scale feels too quick in relation to movement
 2013-09-11 16:35:28 -07:00
Mindy Pereira
af2d8bbdbd Merge "Scale feels too quick in relation to movement" into klp-dev 2013-09-11 23:33:02 +00:00
Alex Ray
5022f275e3 consumer_ir: add length to get carrier freqs 
Change-Id: I2c1ac27e46c0bcfdfadef227a2fa79bdcf7085d4
 2013-09-11 16:21:25 -07:00
Elliott Hughes
62d7bf2ab3 Remove ArpPeer; dead code from Google TV. 
Change-Id: I595a6b6f52ab513a008e0fd861e98bc4488a1999
 2013-09-11 16:21:16 -07:00
Kenny Root
fa34d2ccba Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

(cherry picked from commit 0c4b3646b0feb1bed89bf374ff03af797834d8c3)

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 22:42:02 +00:00
Kenny Root
efbfe81d26 am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit '931f6f8767ee3b234914763262f1580695bcb208':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 15:40:06 -07:00
Alex Ray
1e679441af consumer ir: clarify @link in documentation 
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
 2013-09-11 15:39:05 -07:00
Kenny Root
931f6f8767 Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 2013-09-11 22:37:03 +00:00
Kenny Root
1c7cf90af4 Fix another off-by-one error in ZipFileRO 
Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
 2013-09-11 15:28:39 -07:00
Chong Zhang
f8ca13b7a0 Pass subtitle track properties to SubtitleController 
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
 2013-09-11 15:02:47 -07:00
Tor Norbye
d9273d6f28 Add typedefs and nullness annotations. 
This changeset adds in typedef annotations (custom annotations
marked with @IntDef) for various int parameters and return values
in the API. It also adds nullness annotations for cases where the
documentation explicitly mentioned null policy, or where it was
blindingly obvious from the context. Also fixed some typos in the
documentation.

Change-Id: Ica27c01368895818e26237544edd8483007155bb
 2013-09-11 14:55:38 -07:00
Zhijun He
10ccc3266e am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit 'e550446dcfb96e76715e77e044359b2769ca2676':
  ImageReader: Skip size check for BLOB format
 2013-09-11 14:45:49 -07:00
Xia Wang
0076729d38 Use setAirplaneMode() API for Connectivity Manager tests 
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
 2013-09-11 14:44:30 -07:00
Selim Gurun
a5c86c644b Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
 2013-09-11 14:42:50 -07:00
Chet Haase
abd3d778e5 Hide translucent activity conversion API 
This API and functionality is not yet completely baked. It's worth
thinking more about this mechanism before exposing it as public API.

Issue #10461415 KLP API Review: Activity convert to translucent

Change-Id: I94d986b62443b3bfa7a9a19807ecebe36bf57e07
 2013-09-11 14:33:05 -07:00