Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,050 Commits 3 Branches 0 Tags
af1066d917fd47c8108df98f8a534babd48d18cd
Commit Graph

34890 Commits

Author SHA1 Message Date
Svetoslav Ganov
af1066d917 am 4609d9a9: am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 
* commit '4609d9a9ebc17d804d31d5241968157439c92a57':
  Adding hidden APIs for observing the print jobs state.
 2013-09-26 12:28:59 -07:00
Svetoslav Ganov
4609d9a9eb am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 
* commit '5cab967bf2bab49777bfa86dff8b0f892192ede6':
  Adding hidden APIs for observing the print jobs state.
 2013-09-26 12:25:10 -07:00
Svetoslav Ganov
5cab967bf2 Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 2013-09-26 19:22:20 +00:00
Martijn Coenen
7abfab466a am f12e49f3: am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 
* commit 'f12e49f32edc39c7aca8d123db6f10b1edfb598e':
  Fix crash in ApduServiceInfo parsing.
 2013-09-26 11:55:48 -07:00
Martijn Coenen
f12e49f32e am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 
* commit '1de64c0aa55f74f5b2692dcac3b3350dacda4041':
  Fix crash in ApduServiceInfo parsing.
 2013-09-26 11:52:28 -07:00
Martijn Coenen
1de64c0aa5 Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 2013-09-26 18:48:20 +00:00
Martijn Coenen
eed43391c6 Fix crash in ApduServiceInfo parsing. 
Bug: 10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
 2013-09-26 11:20:37 -07:00
Adam Lesinski
9c437bcb57 am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:31:27 -07:00
Adam Lesinski
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:27:55 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Dianne Hackborn
f17b69e58b am 63cff11b: am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit '63cff11b8aa42efe849c84b8fc74be7c2f354075':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:47:44 -07:00
Dianne Hackborn
63cff11b8a am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit 'c222f57b5c992fb661b7112a7cd5e5dbe1c6030c':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:45:10 -07:00
Dianne Hackborn
c222f57b5c Merge "Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs" into klp-dev 2013-09-26 16:41:14 +00:00
Dianne Hackborn
8828d3a153 Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs 
Add a new array indicating whether each op allows itself to
be reset, and use it.

Change-Id: I494f630bda170e061196a380563512e9e77b51a8
 2013-09-26 09:40:19 -07:00
Svetoslav Ganov
704697b619 Adding hidden APIs for observing the print jobs state. 
This is needed for implementing the print job settigns UI.

bug:10935736

Change-Id: I63b42cbf4ce6a259fa1af47fa368b148ca5621c1
 2013-09-25 17:57:07 -07:00
Zhijun He
72dd6c0f4c am fbf38016: am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev 
* commit 'fbf38016371d2827969429feadc7414a7eb7809d':
  Camera2: Implement CameraManager#getCameraCharacteristics
 2013-09-25 17:05:05 -07:00
Zhijun He
fbf3801637 am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev 
* commit '822ac0bada06b2185b4d5e8304160b680a72cff2':
  Camera2: Implement CameraManager#getCameraCharacteristics
 2013-09-25 17:00:05 -07:00
Zhijun He
822ac0bada Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev 2013-09-25 23:57:24 +00:00
Dianne Hackborn
f3647c7bdc am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev 
* commit 'f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
 2013-09-25 16:50:14 -07:00
Jeff Sharkey
20269bd7c4 Merge "resolved conflicts for merge of 687c6221 to master" 2013-09-25 23:49:32 +00:00
Jeff Sharkey
5023a4df73 resolved conflicts for merge of 687c6221 to master 
Change-Id: I9e8a24d9151f31bc3284ad7f8686fa7f3c25c0d9
 2013-09-25 16:48:01 -07:00
Fabrice Di Meglio
331a7aae20 Merge "Decouple CalendarView code" 2013-09-25 23:47:45 +00:00
Fabrice Di Meglio
f1f93b3863 Merge "Decouple DatePicker code" 2013-09-25 23:47:31 +00:00
Dianne Hackborn
f9ad7b9d92 am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev 
* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
 2013-09-25 16:09:13 -07:00
Jeff Sharkey
687c6221c8 am be17a614: Merge "Require that persistable Uri permissions be taken." into klp-dev 
* commit 'be17a61447e1a7992a6c855059a3c43ab3216610':
  Require that persistable Uri permissions be taken.
 2013-09-25 16:05:36 -07:00
Dianne Hackborn
66a9b2d739 Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev 2013-09-25 23:04:50 +00:00
Jeff Sharkey
be17a61447 Merge "Require that persistable Uri permissions be taken." into klp-dev 2013-09-25 23:01:26 +00:00
Jim Miller
d0ee92408f am 4bf2c790: am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev 
* commit '4bf2c790b971cf43c65d8e9e5721a2a9dde474b5':
  Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
 2013-09-25 15:48:42 -07:00
Dianne Hackborn
cbd9a52f25 Fix issue #10903002: com.facebook.katana keeps itself in A Services 
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.

Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing.  You will
still get to see them with the "-a" flag.

Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process.  Not yet used at this point.

Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
 2013-09-25 15:45:56 -07:00
Jim Miller
4bf2c790b9 am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev 
* commit '04b0840b2e5367547fdd92f4e2c68cde16486062':
  Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
 2013-09-25 15:44:15 -07:00
Jim Miller
04b0840b2e Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev 2013-09-25 22:41:26 +00:00
Alan Viverette
e4b0a9a940 am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev 
* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
  Fix caption rendering
 2013-09-25 15:26:57 -07:00
Alan Viverette
607ea331eb am 812b6426: Merge "Fix caption rendering" into klp-dev 
* commit '812b64264176cb8a253a8253074bc9595503d2ac':
  Fix caption rendering
 2013-09-25 15:23:50 -07:00
Alan Viverette
812b642641 Merge "Fix caption rendering" into klp-dev 2013-09-25 22:21:08 +00:00
Jeff Sharkey
e66c1778f8 Require that persistable Uri permissions be taken. 
Change our Intent flag to indicate that a Uri permission grant is
persistable, but don't actually persist it until explicitly taken by
the receiving app.  This prevents apps from spamming each other if
persisted permissions aren't really required.

Remember the last time a persisted grant was taken by an app, and
use this to prune away the oldest grants when the number of grants
grows too large.  Allow apps to query persisted grants they are
holding, and allow them to release previously persisted grants. Add
public UriPermission class to return grant details and timestamp.

Track various permission strengths separately, and combine together
after each mutation pass.  Persistable grants are currently treated
like global grants, but they could be moved to have owners in the
future.  Require that grant holders trying to extend a persistable
permission actually hold a persistable permission themselves.

Bug: 10835779
Change-Id: I95b2f797c04ce7fd2612f9a644685dbd44e03759
 2013-09-25 15:16:41 -07:00
Jim Miller
138f25d756 Accessibility improvements in keyguard 
- add accessibility descriptions to camera and search light
- add new onClick handler to simplify launching search and camera
- plumb camera launch through KeyguardService interface

Fixes bug 10914360

Change-Id: Ic85eda9afadba7381be78b477180f7204030cd17
 2013-09-25 15:01:19 -07:00
Jim Miller
14176c6c0d am 132540d1: am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 
* commit '132540d1f5656145639f0206076d1ba63183bbfb':
  Fix accessibility for all-caps items in keyguard
 2013-09-25 14:58:28 -07:00
Jim Miller
132540d1f5 am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 
* commit 'd7fdcad22683e6191e92141a7e45e2414fe40a44':
  Fix accessibility for all-caps items in keyguard
 2013-09-25 14:55:31 -07:00
Jim Miller
d7fdcad226 Merge "Fix accessibility for all-caps items in keyguard" into klp-dev 2013-09-25 21:53:41 +00:00
Adam Lesinski
5b4ef81f2b Add Graphics alloc tracking via memtrack 
Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.

bug:10294768

Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
 2013-09-25 14:41:49 -07:00
Zhijun He
2001188be3 Camera2: Implement CameraManager#getCameraCharacteristics 
Bug: 10904541
Bug: 10360518
Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
 2013-09-25 13:54:25 -07:00
Eino-Ville Talvala
7b388f9035 am 6934e994: am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 
* commit '6934e994a0b7e6c950df151690f0840075fec432':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.
 2013-09-25 12:38:07 -07:00
Alan Viverette
7fe420f31b Fix caption rendering 
Fixed rendering of captions in regions and incorrect caption width
measurement. Removes minimum-difference line wrapping, since the
results weren't consistent with StaticLayout's rendering.

BUG: 10917766, 10822229
Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
 2013-09-25 12:35:00 -07:00
Eino-Ville Talvala
6934e994a0 am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 
* commit '9ca833f4a5eca732b1618bc1a183215c21ae11e5':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.
 2013-09-25 12:32:53 -07:00
Eino-Ville Talvala
9ca833f4a5 Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 2013-09-25 19:28:03 +00:00
Dianne Hackborn
6885d577cb am 8715dc14: am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '8715dc1401557f5ec068f9214ab0712291a3b403':
  Replace SEAndroid with SELinux.
 2013-09-25 11:48:40 -07:00
Dianne Hackborn
8715dc1401 am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '4213e68f67d59c0912d2a8729fcec4539197756a':
  Replace SEAndroid with SELinux.
 2013-09-25 11:45:38 -07:00
Dianne Hackborn
4213e68f67 am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '3a7d5f71456b57f712b0f878beb5317f0ce6d564':
  Replace SEAndroid with SELinux.
 2013-09-25 11:42:07 -07:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
Mike Lockwood
90079ba97a Merge "Cleanup Binder interface between sensorservice and BatteryStats" 2013-09-25 16:56:00 +00:00