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

54281 Commits

Author SHA1 Message Date
Chien-Yu Chen
ef2dbbbdbd am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 20:46:56 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
Tingting Wang
d2e88848f4 am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 20:16:52 +00:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00
Tingting Wang
d55b348e62 Don't display Custom for PHONE_TYPE=CUSTOM part 1. 
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
 2015-07-08 12:55:22 -07:00
Chien-Yu Chen
72333917a7 Camera: Enforce ZERO_SHUTTER_LAG mode 
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
 2015-07-08 11:55:19 -07:00
Benjamin Franz
34c562a402 am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 14:05:36 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy 
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
 2015-07-08 14:37:28 +01:00
Zoltan Szatmary-Ban
0e70616cb4 am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 
* commit '895927603606e58a46ecaee8f2244e1e2b6f2840':
  Expose time-interval detail query on INetworkStatsSession
 2015-07-08 11:44:27 +00:00
Zoltan Szatmary-Ban
8959276036 Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 2015-07-08 11:33:00 +00:00
Neil Fuller
93492e02cc am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os" 
* commit '26e58f09d9c040b8abaa5184a16ec52e5f401b4c':
  Move listen() over to using android.system.Os
 2015-07-08 10:50:15 +00:00
Neil Fuller
b05c2bebf8 Merge "Move listen() over to using android.system.Os" 2015-07-08 10:18:14 +00:00
Dianne Hackborn
f3fe497f75 am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit 'b14dc048ec8323e4a10bbfe42129bb91616470b8':
  Add new "preinstalled" permission flag.
 2015-07-08 01:07:37 +00:00
Dianne Hackborn
a90c8def2c Add new "preinstalled" permission flag. 
This allows you to specify that a permission can be granted to
any pre-installed system app (not just privileged ones).

And as long as I am doing this, clean up the old "system" permission
flag, renaming it to "privileged" which is what it really is today,
deprecating the old names.  And switch the platform's permission
declarations to use the new name.

Change-Id: Iabf484746af232144786851ec7fe90e3de9dddb2
 2015-07-07 17:25:25 -07:00
Dianne Hackborn
15f858aada am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit 'f2474d336a7df696f3897e2cd255d138eb3fac02':
  Implement better handling of text in assist.
 2015-07-07 23:57:53 +00:00
Svetoslav
51be65dd12 am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev 
* commit '3e07ee078de8e364d6be0b18b2b514e40decdb3c':
  Grant installer and verifier install permissions robustly
 2015-07-07 23:57:37 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Jeff Sharkey
922938dfef am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '15369c6c3ba50a852ed0c499eb5929436cffa005':
  Fix volume naming when surfaced over MTP.
 2015-07-07 23:49:46 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist. 
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
 2015-07-07 16:47:37 -07:00
Svetoslav
3e07ee078d Merge "Grant installer and verifier install permissions robustly" into mnc-dev 2015-07-07 23:44:34 +00:00
Jeff Sharkey
15369c6c3b Merge "Fix volume naming when surfaced over MTP." into mnc-dev 2015-07-07 23:42:44 +00:00
Alan Viverette
963471f08f am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit 'f12c91f5e67171bae0d36e89a507c96ff81d04a2':
  Remember focused child during layout when adapter has stable IDs
 2015-07-07 23:37:35 +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
7ca881549c am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '3054f595146bbf8c71d4caaf1aad83252d5bcbea':
  Camera2: implement Key.toString()
 2015-07-07 22:29:32 +00:00
Chien-Yu Chen
ea01d3b80a am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '69421363c6a81a788b963d2f4cb5fdeaa8bd4200':
  ImageWriter: Exception when Surface is abandoned
 2015-07-07 22:29:19 +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
c4e29c06ae am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit 'e9cbf41561e4b4ac605b075d3d2531aef32dd32d':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-07 22:08:33 +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
6dbdb75314 am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 
* commit '384a04d93622c764bf1e8a69c288957d78b6a4e4':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-07 21:53:12 +00:00
Jeff Sharkey
7a788a865e Fix volume naming when surfaced over MTP. 
Otherwise we show everything as "Unknown."

Bug: 22256092
Change-Id: I19fe8a25aff02db8ca9aff288e6715d469f65327
 2015-07-07 14:40:28 -07: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
79dcffbcfd am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '8830db0a6a595f1690cb6f0b76863c3759a8ccbd':
  Never fully detach header or footer views in AbsListView
 2015-07-07 21:16:20 +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
Svetoslav
3e7d977ff7 Grant installer and verifier install permissions robustly 
bug:22248271

Change-Id: I3a47ae9a112ba7d88b421fcb5f9651d1168ba7a5
 2015-07-07 14:02:51 -07: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
eeb3b02530 am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit '0c58229306f30e26d4b0ddb3d332def9b7382480':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-07 20:27:45 +00:00
Dongwon Kang
0c58229306 Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 2015-07-07 20:22:40 +00:00
Aravind Akella
8e2a15a31e am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit 'c5889757cb7474b613db22cc7a0af44fe50661fd':
  Clean up get sensorList.
 2015-07-07 20:02:25 +00:00
Aravind Akella
c5889757cb Merge "Clean up get sensorList." into mnc-dev 2015-07-07 19:53:46 +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
2dbd5c0a88 am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit '6ef57e974144e05e83ee1bd00f705f0f409f48b3':
  Don't update DisplayLists when dumping
 2015-07-07 18:55:57 +00: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
Neil Fuller
1108c06aca 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:45:44 +00:00
Zoltan Szatmary-Ban
72027d2e42 Expose time-interval detail query on INetworkStatsSession 
Also, force polling when a session is opened for NetworkStatsManager.

Bug: 21864554
Bug: 21754685
Change-Id: I24ea822c2d5bc1421ec7ee65d0cfe27cf02dd69e
 2015-07-07 17:36:54 +01:00
Ian Pedowitz
df60365eb3 am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit '937edac8e8583023019b625dd426ebf65169e30d':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 16:18:47 +00:00
Zoltan Szatmary-Ban
2b713c2fd3 am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 16:18:12 +00:00