Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,691 Commits 3 Branches 0 Tags
54b09b34941ea7e2d71da7e4e57de25878dbb3d5
Commit Graph

50660 Commits

Author SHA1 Message Date
Benjamin Franz
54b09b3494 am 5a9102e3: am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit '5a9102e307f395dec106cd5e0109abf9b0e07d5b':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 15:17:12 +00:00
Benjamin Franz
5a9102e307 am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit '12ceccaf7aa4198bb578bcba844729c0ac146d6d':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 14:47:52 +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
9a4c5f2782 am 55a3a233: am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 
* commit '55a3a23307ba1591b95941f7c487c931da505ce0':
  Expose time-interval detail query on INetworkStatsSession
 2015-07-08 13:10:13 +00:00
Zoltan Szatmary-Ban
55a3a23307 am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 
* commit '5bc85aa8dbfdf03a5e764e74c415189c1bfa591c':
  Expose time-interval detail query on INetworkStatsSession
 2015-07-08 12:55:18 +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
a02e3c7ed7 am 849558b7: am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os" 
* commit '849558b72711e57a06fa4df2d6c5a2294df5d49e':
  Move listen() over to using android.system.Os
 2015-07-08 11:05:13 +00:00
Neil Fuller
849558b727 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:36 +00:00
Dianne Hackborn
ee94484303 am 7b3add61: am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit '7b3add61c9e47b708725147dffc23d396db37add':
  Add new "preinstalled" permission flag.
 2015-07-08 02:17:58 +00:00
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
 2015-07-08 02:05:44 +00:00
Svetoslav
4e5dac3d6e am 3fd5ebfd: am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev 
* commit '3fd5ebfd778e540276fb5205a8ba3185e620647d':
  Grant installer and verifier install permissions robustly
 2015-07-08 02:05:26 +00:00
Jeff Sharkey
a4da90dbab am 28339797: am 6e77499a: am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '28339797043834e5f1cd196363ef3cfdd66607ad':
  Fix volume naming when surfaced over MTP.
 2015-07-08 02:05:19 +00:00
Alan Viverette
b6bd296f60 am 6dcbc0a5: am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit '6dcbc0a578100b0484c199e64be251cbb5212330':
  Remember focused child during layout when adapter has stable IDs
 2015-07-08 02:04:57 +00:00
Chien-Yu Chen
2748e8c8d5 am 392b917e: am 61430694: am 843236b6: am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '392b917e1b25e1a1a8dfe3ec054058e82ded56ce':
  Camera2: implement Key.toString()
 2015-07-08 02:04:11 +00:00
Chien-Yu Chen
b07de6d418 am 32ade1ab: am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '32ade1ab7b7a3ca11a586abda99b3f9a8b5b8ec8':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 02:03:55 +00:00
Eino-Ville Talvala
810bc8d335 am af72d92b: 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 'af72d92bf124697dd2f4528a730806c56bff503d':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-08 02:03:35 +00:00
Alan Viverette
b2cc376e8c am 75f4278d: am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '75f4278d73d701191ad82cb0e3b5566feff8d873':
  Never fully detach header or footer views in AbsListView
 2015-07-08 02:03:18 +00:00
Aravind Akella
5baa0e4a35 am f606595c: am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit 'f606595c7697060663b234dc31fbf2cb79419ed5':
  Clean up get sensorList.
 2015-07-08 02:02:29 +00:00
Dianne Hackborn
7b3add61c9 am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit 'f368f6b9786f5a62561845744d601a20148716b4':
  Add new "preinstalled" permission flag.
 2015-07-08 02:01:38 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
 2015-07-08 01:39:53 +00:00
Svetoslav
3fd5ebfd77 am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev 
* commit '7cc8de60682b1ed22be1b452809b36a5ceaae02a':
  Grant installer and verifier install permissions robustly
 2015-07-08 01:39:40 +00:00
Jeff Sharkey
2833979704 am 6e77499a: am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '6e77499a04e5aa379236e2dcbaf959e1f562e6ef':
  Fix volume naming when surfaced over MTP.
 2015-07-08 01:39:34 +00:00
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
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
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
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
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +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
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
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
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
Chris Craik
42afac8864 am 7f6a3303: am b5892a41: am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit '7f6a33039ab9c560fae8c09f88a7f694a2722fba':
  Don't update DisplayLists when dumping
 2015-07-07 20:37:44 +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
Ian Pedowitz
ecb7af7d10 am 0a5e18bf: am a3599c78: am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit '0a5e18bfe23f4b256bbda995a1f3e383fa979ee3':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 19:09:08 +00:00
Zoltan Szatmary-Ban
daed4c4c3e am 91a92009: am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '91a920099f871125bab78f7843bedf6984c2a71b':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 19:08:38 +00:00
Richard Coles
1636ad867e am 4683bea8: am 2ec1f9d5: am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit '4683bea8b60285e7480f997b6fb4c0e2e9f6106b':
  Add WebView permission MIDI sysex
 2015-07-07 19:08:30 +00:00
Andrei Stingaceanu
734d61c2c2 am 4a981c3a: am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit '4a981c3a25cdce5d3a5c95beb7c2215476309d45':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 19:08:16 +00:00