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

111585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00: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
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00: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
91019c9ef3 Merge "Remove dependency on JNIHelp header side effects." into klp-dev 2013-09-12 00:01:28 +00:00
Amith Yamasani
bdd06c0a13 Merge "Change selection highlight for intent disambig dialog" into klp-dev 2013-09-11 23:56:44 +00:00
Chong Zhang
bcb97996eb Merge "Pass subtitle track properties to SubtitleController" into klp-dev 2013-09-11 23:51:45 +00: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
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
Xia Wang
0076729d38 Use setAirplaneMode() API for Connectivity Manager tests 
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
 2013-09-11 14:44:30 -07:00
Zhijun He
e550446dcf Merge "ImageReader: Skip size check for BLOB format" into klp-dev 2013-09-11 21:31:54 +00:00
destradaa
f8a910fbd5 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 2013-09-11 21:15:34 +00:00
Adam Powell
6847447da0 Merge "Action bar refactoring and transitions" into klp-dev 2013-09-11 20:38:41 +00:00
Eino-Ville Talvala
70c2207c34 Camera2: Immutable metadata 
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
 2013-09-11 13:18:10 -07:00
Zhijun He
37682135da ImageReader: Skip size check for BLOB format 
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.

Bug: 10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
 2013-09-11 13:18:00 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 20:16:59 +00:00
Amith Yamasani
ab7cbcef49 Change selection highlight for intent disambig dialog 
Use standard selection/activation highlights

Bug: 10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
 2013-09-11 13:06:23 -07:00
Kenny Root
d292f790be Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 19:47:13 +00:00
destradaa
839904eed8 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

Bug: 10691492
Change-Id: I1959712912af712dc9dc344f20afd1112da46efc
 2013-09-11 12:42:51 -07:00
Eino-Ville Talvala
4af73c2153 Camera2: Listener rework and other API updates 
- Add Handlers to each callback-accepting function
 - Expand CameraDevice ErrorListener to CameraDeviceListener
   - Add idle callback
   - Split out disconnect error to its own callback
 - Add CameraDevice#getId
 - Rename CameraManager's listener to AvailabilityListener
 - Rename CameraManager register/unregister*Listener to
   add/remove*Listener
 - Rename getDeviceIdList to getCameraIdList

Bug: 10549567
Bug: 10549462
Change-Id: Idd2ae8ad8eb126f35a15d765306ada7c1cf74eea
 2013-09-11 12:41:27 -07:00
Tom O'Neill
706113fa2a Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 2013-09-11 19:20:16 +00:00
Santos Cordon
e0b7e4cf45 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-11 19:08:34 +00:00
Alexander Ray
7563d42331 Merge "Add consumer IR framework" into klp-dev 2013-09-11 19:05:38 +00:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Kenny Root
0d6c2d7b9d Reconcile differences between zip implementations 
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
 2013-09-11 11:44:40 -07:00
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Victoria Lease
444ae3a2e6 Merge "include Padauk in fallback chain" into klp-dev 2013-09-11 18:27:59 +00:00
Amith Yamasani
b926d484a7 Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev 2013-09-11 18:27:53 +00:00
Dianne Hackborn
c1cf491d16 Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-11 18:13:17 +00:00
Kenny Root
b5f694f683 Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 2013-09-11 18:11:34 +00:00
Amith Yamasani
2e804444d6 Handle the case where the restore environment doesn't have the ringtone 
Bug: 10130785

uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.

Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
 2013-09-11 11:11:19 -07:00
Kenny Root
0c4b3646b0 Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 18:10:09 +00:00
Dianne Hackborn
b3ac67a0ec More on issue #10130785: Restore silence and vibrate settings... 
...in settings > sound

ContentResolver.uncanonicalize needs to be able to fail.

Change-Id: I347ef60fc3619aae203b87079579597c60be8b90
 2013-09-11 11:04:21 -07:00
Tom O'Neill
d5759437ee Improve some javadoc related to isProviderEnabled() apis 
- LocationManager.isProviderEnabled() no longer throws SecurityException:
the caller could already circumvent the permission check by calling
Secure.isLocationProviderEnabled()

Change-Id: I5abd04264299671ed35ce4594b5be46d86378767
 2013-09-11 11:03:03 -07:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs 
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
 2013-09-11 11:01:13 -07:00
Jonathan Dixon
caee47f096 Merge "Preparation for deleting WebViewClassic" into klp-dev 2013-09-11 17:59:42 +00:00
Martijn Coenen
b7e5692b62 Merge "Add support for loading banners from HCE services." into klp-dev 2013-09-11 17:52:18 +00:00
Dianne Hackborn
e9aad4ae31 Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 2013-09-11 17:46:13 +00:00
Adam Skory
427e92a265 Merge "Fix bad references in preloaded-classes" into klp-dev 2013-09-11 17:44:15 +00:00
Chris Craik
68fbe16ba0 Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 2013-09-11 17:40:39 +00:00
Kenny Root
139ae5477f Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 17:38:26 +00:00
Adam Skory
aae67e11bc Fix bad references in preloaded-classes 
http://ag/352924 renamed INdefPushCallback
to IAppCallback. Update preloaded-classes
to reflect this.

This is a cherry-pick of Id552e94e3a01cdd61593480f3c0aedb32d185f80

Change-Id: I0901f14fb41f94e3c7572c09e090ec5903a878d1
 2013-09-11 18:35:33 +01:00
Yuhao Zheng
518c0afaea Merge "Fix for the toggle airplane mode hidden API" into klp-dev 2013-09-11 17:35:09 +00:00
quddusc
ecf612a15c am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'eacfc308344b34d27b7cd2ab8cc0fbdefbcc8167':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:17:41 -07:00