Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,373 Commits 3 Branches 0 Tags
6dcbc0a578100b0484c199e64be251cbb5212330
Commit Graph

54255 Commits

Author SHA1 Message Date
Alan Viverette
6dcbc0a578 am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit '382fe3b82bda9898fbb288f947c9d85fa507c6c3':
  Remember focused child during layout when adapter has stable IDs
 2015-07-08 01:39:15 +00:00
Chien-Yu Chen
392b917e1b am 61430694: am 843236b6: am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '6143069410d8f56a97b6c848f1dff812581f0ab7':
  Camera2: implement Key.toString()
 2015-07-08 01:38:04 +00:00
Chien-Yu Chen
32ade1ab7b am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '1ae0a7d39bfe87d0857268070cbf0ff7fa666e37':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 01:37:52 +00:00
Adam Powell
2ed094090a am 940abed2: am 6f3f660c: am 24bf1226: am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit '940abed246f37454426f56c9cbb37e12ec4cdfb5':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-08 01:37:38 +00:00
Eino-Ville Talvala
af72d92bf1 am 314877b8: am 2915f3c6: am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 
* commit '314877b849dee7c5b06a2cd282c74ce9bbb35fc1':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-08 01:37:25 +00:00
Alan Viverette
75f4278d73 am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '3c254abac56e145dae11d86254bd4a7e0a2b5397':
  Never fully detach header or footer views in AbsListView
 2015-07-08 01:37:09 +00:00
Dongwon Kang
6ac3a48544 am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit 'e94f5f556f5a46cf6745ae642d245ca712e1f254':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-08 01:36:36 +00:00
Aravind Akella
f606595c76 am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit '5444b6be805d51964f19c8437e322a676ad8ea2a':
  Clean up get sensorList.
 2015-07-08 01:36:17 +00:00
Alan Viverette
f12c91f5e6 Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 2015-07-07 23:26:36 +00:00
Chien-Yu Chen
3054f59514 Merge "Camera2: implement Key.toString()" into mnc-dev 2015-07-07 22:17:08 +00:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Adam Powell
e9cbf41561 Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 2015-07-07 21:55:45 +00:00
Eino-Ville Talvala
384a04d936 Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 2015-07-07 21:36:47 +00:00
Alan Viverette
8830db0a6a Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 2015-07-07 21:08:32 +00:00
Eino-Ville Talvala
0dd17509a9 Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement 
This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary

Bug: 22266686

Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
 2015-07-07 13:39:55 -07:00
Dongwon Kang
0c58229306 Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 2015-07-07 20:22:40 +00:00
Aravind Akella
c5889757cb Merge "Clean up get sensorList." into mnc-dev 2015-07-07 19:53:46 +00:00
Chris Craik
7f6a33039a am b5892a41: am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit 'b5892a4156c446d875838cce3404579d8f066ca3':
  Don't update DisplayLists when dumping
 2015-07-07 19:47:16 +00:00
Chien-Yu Chen
12a8385b7e Camera2: implement Key.toString() 
Implement toString() for CameraCharacteristics.Key,
CaptureResult.Key, and CaptureRequest.Key.

Bug: 22279124
Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
 2015-07-07 12:17:22 -07:00
Chris Craik
6ef57e9741 Merge "Don't update DisplayLists when dumping" into mnc-dev 2015-07-07 18:42:15 +00:00
Alan Viverette
1638133b3f Never fully detach header or footer views in AbsListView 
AbsListView has special handling of header and footer views that avoids
full attachment; however, we still need to fully detach and reattach
non-header/footer views that cannot be recycled.

Bug: 22239425
Bug: 22238597
Bug: 22214485
Change-Id: Iae5f954fc76522c0a52d0c25e19985ae0196efa2
 2015-07-07 11:04:32 -07:00
Chris Craik
356b5fe086 Don't update DisplayLists when dumping 
bug:22234438

Updating the displaylist is invalid since this debug method isn't
called on the UI thread, and it defeats the purpose of seeing what
the hierarchy is currently rendering.

Change-Id: I10c5cc6dbae8d304559dfc6e863b0ede158d554f
 2015-07-07 10:39:39 -07:00
Ian Pedowitz
0a5e18bfe2 am a3599c78: am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit 'a3599c7819fc29880695b30679af3bb327808e7c':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 17:34:45 +00:00
Zoltan Szatmary-Ban
91a920099f am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '6ad79259540e9e73c3d4664b03c103a560433db0':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 17:34:23 +00:00
Richard Coles
4683bea8b6 am 2ec1f9d5: am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit '2ec1f9d594f0c5f95db08cbf04830b854e6c701c':
  Add WebView permission MIDI sysex
 2015-07-07 17:34:17 +00:00
Andrei Stingaceanu
4a981c3a25 am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit '8f40a25de70bdb6878a5622fce2818039c4fdfbb':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 17:34:04 +00:00
Abodunrinwa Toki
2487557a16 am 10daed5e: am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '10daed5ebf3e176a4486721017055c0598740fdf':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 17:33:52 +00:00
Neil Fuller
b66e748577 am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os" 
* commit '2332544040d294ee81f64aabebe49c4f548c1337':
  Reimplement LocalSocket methods using android.system.Os
 2015-07-07 16:46:44 +00:00
Neil Fuller
50d11ded0d Merge "Reimplement LocalSocket methods using android.system.Os" 2015-07-07 16:11:48 +00:00
Ian Pedowitz
937edac8e8 Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
This reverts commit d6b404c72d.

This CL seems to have broken the build, causing GMSCore to continuously
crash.

Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
 2015-07-07 08:32:44 -07:00
Zoltan Szatmary-Ban
41df5bfc0d Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 2015-07-07 10:17:07 +00:00
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Dongwon Kang
7980d10d7c Revert "Use AlertDialog for MediaRouteControllerDialog" 
This reverts commit 001d51496d.

Background: To just inherit AlertDialog, the content view should include
a title as we do in support library (AlertDialog uses NO_TITLE feature),
but up-streaming support library implementation to the framework at this
point might cause more issues. Verified that the narrow dialog issue
(b/22044600) does not happen in the framework implementation regardless of
whether it uses AlertDialog or not.

Bug: 22286869
Change-Id: Ic2554cc9e683beff29d1deee91945c1dace83ab1
 2015-07-06 20:09:03 -07:00
Adam Powell
a182e45c68 Sort and limit ChooserActivity targets from ChooserTargetServices 
Apply an automated decay factor if apps decide to claim all of their
targets are SUPER IMPORTANT. Apply the multiplier from the apps
themselves as well as a penalty for apps that come in late - let's see
how fast developers get their ChooserTargetServices to start!

Also fix a bug with ResolverDrawerLayout where dragging from the title
area wouldn't always work properly.

Bug 22302285

Change-Id: Ib6eb2b6fb92608790b2267c0f671c9ae59b2907e
 2015-07-06 18:39:34 -07:00
Chien-Yu Chen
e0ee63046a ImageWriter: Exception when Surface is abandoned 
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.

Also fix a crash when planes are not initialized when closing
ImageWriter.

Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
 2015-07-06 18:26:28 -07:00
Adam Lesinski
8f387fc09a am f036847f: am c6c21522: am a5bd0e3a: am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 
* commit 'f036847f2fe0c217965b808f1608d7d0bd7fd573':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
 2015-07-07 01:18:04 +00:00
Billy Lau
4ce9ebea91 am bb1a1e5f: am e2835f9f: am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit 'bb1a1e5ffdbf3749f3208d570945c4bcb5ecba3f':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-07 01:17:56 +00:00
Aravind Akella
b566d2090d am 948d4e13: am 61f398fc: am 8cc759a5: am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev 
* commit '948d4e1307dc467c634114e677842be8c89822f1':
  Remove flag mDataInjectionMode.
 2015-07-07 01:17:51 +00:00
Winson Chung
a9b08df90e am dc91eca6: am 45e1153d: am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit 'dc91eca6545ae1a9cae1e0336897e26ce313829c':
  Adding metrics to overview.
 2015-07-07 01:17:45 +00:00
Adam Lesinski
fe45b29a1c Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 2015-07-07 00:32:24 +00:00
Billy Lau
c81ecb6d2c Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-07 00:27:33 +00:00
Aravind Akella
adaa79d722 Merge "Remove flag mDataInjectionMode." into mnc-dev 2015-07-07 00:24:04 +00:00
Winson Chung
2924dc3466 Merge "Adding metrics to overview." into mnc-dev 2015-07-07 00:17:56 +00:00
Billy Lau
d6b404c72d Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission 
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
 2015-07-07 00:27:53 +01:00
Dianne Hackborn
7a90c53631 am bcbf4641: am 569984f2: am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev 
* commit 'bcbf46419075a1bd132839a0e4d559de31a61f92':
  Add easy way to get device idle whitelist.
  Don't prevent windows from drawing when they are just moving
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
  Avoid IllegalStateException when generating/importing keys.
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
  Unhide signal strength constants used by getLevel.
 2015-07-06 23:10:20 +00:00
Winson Chung
5c9f4b90bf Adding metrics to overview. 
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
 2015-07-06 15:52:21 -07:00
Adam Lesinski
61db88fc8b BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore 
Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
 2015-07-06 15:36:46 -07:00
Aravind Akella
d4cc5ec230 Remove flag mDataInjectionMode. 
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
 2015-07-06 14:57:23 -07:00