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

10898 Commits

Author SHA1 Message Date
Svet Ganov
f7b541ff74 Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev 2015-05-19 00:13:22 +00:00
Jeff Brown
6531ea8826 am 912bda17: am b8d5c965: am d5538758: Merge "Rename file descriptor listener API." into mnc-dev 
* commit '912bda17ead1eaef5e1f71a3af0f9a0ac64f0d69':
  Rename file descriptor listener API.
 2015-05-19 00:10:08 +00:00
Jeff Brown
d5538758af Merge "Rename file descriptor listener API." into mnc-dev 2015-05-18 22:47:47 +00:00
Svet Ganov
408abf7f1b Do not report WiFi and Bluetooth MAC addresses - framework. 
As a part of the new runtime permissions work we are limiting
the PII apps can access. BT and WiFi MAC addresses are PII and
based on our research there is no valid use case for app dev
to get these addresses aside of user tracking which we are
trying to limit.

bug:21078858

Change-Id: Ib48223b272c0fd4f5c36acc889d4f44df204b309
 2015-05-18 15:14:24 -07:00
Adam Powell
3245c48f98 am e9182222: am dc9ca092: am 98465f99: Merge "Add Configuration data for round displays" into mnc-dev 
* commit 'e918222288ca1071aac6ece66d4c63202f8d468b':
  Add Configuration data for round displays
 2015-05-18 22:05:09 +00:00
Adam Powell
49e7ff9647 Add Configuration data for round displays 
Add round values to the screenLayout field for Configuration
and a convenience method to check roundness.

Plumb this through the DisplayManager, making roundness the property
of a DisplayAdapter. The built-in main display will read the
configuration resource config_mainBuiltInDisplayIsRound to determine
its roundness. Device-specific resource overlays should set this to
true for devices with round primary displays.

By default, this config resource inherits from the existing
config_windowIsRound value currently used by some Android Wear
device configurations.

This change awaits another for aapt/native resources code to make the
resource filtering system aware of this property.

Change-Id: I1daced7ca6d6e172789e7c32bebfd43753bfa2ae
 2015-05-18 14:13:33 -07:00
Jae Seo
c29ff1fe20 am a730719a: am 350a0528: am 194118f9: Merge "Make PlaybackParams parcelable" into mnc-dev 
* commit 'a730719a1dffd1f0d97b86f3bb4383116701f5ad':
  Make PlaybackParams parcelable
 2015-05-18 18:38:42 +00:00
Jae Seo
194118f913 Merge "Make PlaybackParams parcelable" into mnc-dev 2015-05-18 18:05:34 +00:00
Jae Seo
76c4fc2977 Make PlaybackParams parcelable 
Bug: 21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
 2015-05-18 17:54:47 +00:00
Svet Ganov
86e86a77fc am 11fe86ae: am a4f7ea55: am 321f0157: Hide platform platform legacy permissions behind a menu option - framework. 
* commit '11fe86ae6e30a4e642b9c7255af21c522334a147':
  Hide platform platform legacy permissions behind a menu option - framework.
 2015-05-17 11:53:19 +00:00
Svet Ganov
321f01574e Hide platform platform legacy permissions behind a menu option - framework. 
bug:21195624

Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8
 2015-05-16 22:52:33 -07:00
Zach Johnson
0bf27e9b04 am 85f82784: am 4b197204: am a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev 
* commit '85f82784f88a6bd2a94ee5bf44b8d105bcb1671b':
  Create unified BIND_CARRIER_SERVICES permission
 2015-05-15 23:20:34 +00:00
Jeff Tinker
61ba4256bc am 2d33fbeb: am 922bdb1b: am 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev 
* commit '2d33fbeb13ae853cc22e4318f3db28f5da76f6f7':
  MediaDrm API Updates per api council review
 2015-05-15 22:47:59 +00:00
Zach Johnson
a80282a733 Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev 2015-05-15 22:40:35 +00:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Selim Gurun
dbd61b4156 am f8a45c55: am 62b845b7: am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev 
* commit 'f8a45c55d42e1fc9f61d3bdbc369c34e65591c6a':
  Rename PostMessageToMainFrame to PostWebMessage
 2015-05-15 20:28:12 +00:00
Alex Klyubin
9d6c0b68e0 am bef1706b: am 90c1c454: am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev 
* commit 'bef1706b875ef63e867228ab88bbd5c4de9c8318':
  Remove "encrypt at rest" flag from new AndroidKeyStore API.
 2015-05-15 20:28:01 +00:00
Jeff Brown
3f6405259a Rename file descriptor listener API. 
Bug: 21039493
Change-Id: I506c429e99528eb04dbda5b28da2ad000d10b467
 2015-05-15 12:28:15 -07:00
Selim Gurun
afabc21722 Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev 2015-05-15 18:47:45 +00:00
Alex Klyubin
96481c3ddc Remove "encrypt at rest" flag from new AndroidKeyStore API. 
This flag causes issues such as being unable to generate, import, or
use keys when the user/profile secure lock screen credential hasn't
yet been entered after boot.

Bug: 18088752
Change-Id: I992f6dfdc945bcb83e341356a40dfa7d7bc143d8
 2015-05-15 11:07:42 -07:00
Selim Gurun
26de90aa2e Rename PostMessageToMainFrame to PostWebMessage 
Bug: 20557074

There is no need to keep the name PostMessageToMainFrame since
we may choose to not implement the special condition to posting
to a named subframe. And if we want, we can do this by overloading
the function.

Change-Id: I9896ad479e1c30cda500352cfdb1b7d336383568
 2015-05-15 11:02:45 -07:00
Paul McLean
454a18d016 am 9c4531f0: am f6f170a1: am 0c72f4f9: Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev 
* commit '9c4531f0f8d3c1d823cbf1758c6f07e355c2ffb7':
  Change AudioDevicesInfo.getFormats() to getEncodings().
 2015-05-15 16:57:52 +00:00
Dan Sandler
763c389953 am 2910f53a: am 031339ba: am d63f9321: Icon support comes to Notification. 
* commit '2910f53aaaa476e989b84ecb068b7845cca5de5f':
  Icon support comes to Notification.
 2015-05-15 16:57:34 +00:00
Dan Sandler
9a84b30953 am 0575d52a: am 71e69160: am aee0c2ce: Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev 
* commit '0575d52a1f6222a18c4148d493accbf35fe45213':
  Use Context instead of Resources in Icon.createWithResource.
 2015-05-15 16:57:29 +00:00
Paul McLean
0c72f4f9d0 Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev 2015-05-15 14:35:50 +00:00
Dan Sandler
d63f9321e6 Icon support comes to Notification. 
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
 2015-05-15 12:35:21 +00:00
Dan Sandler
aee0c2ce39 Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev 2015-05-15 04:39:42 +00:00
Christopher Tate
7734d61214 am 773dd6fd: am 31ad3d55: am abcbf05c: Merge "fullBackupContent isn\'t public API" into mnc-dev 
* commit '773dd6fd213444f3ed02639fc56ef1b39ca11295':
  fullBackupContent isn't public API
 2015-05-15 02:23:38 +00:00
Christopher Tate
abcbf05c98 Merge "fullBackupContent isn't public API" into mnc-dev 2015-05-15 01:50:39 +00:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review 
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
 2015-05-15 01:44:59 +00:00
Zhijun He
9b533b5eb6 am 79fc2da0: am ff704248: am 492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev 
* commit '79fc2da09f4bb848f284ecc4386c818e1f6d3084':
  Image/Reader/Writer: address API review comments
 2015-05-14 22:21:11 +00:00
Zach Johnson
cdaaa91f7c Create unified BIND_CARRIER_SERVICES permission 
Replace BIND_CARRIER_MESSAGING_SERVICE and
BIND_CARRIER_CONFIG_SERVICE since we don't really
need one permission for each carrier service type.

Deprecate BIND_CARRIER_MESSAGING_SERVICE since it
already shipped, but remove BIND_CARRIER_CONFIG_SERVICE
since it hasn't.

b/21165906

Change-Id: I716f3f1c98a228afcfee84cf4a48911f0736ce8c
 2015-05-14 15:10:39 -07:00
Chong Zhang
c0f3f28b5d am 5992dacc: am b27d3858: am 7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev 
* commit '5992dacc7f980e35db0c8918ab7dc2088f3ae479':
  MediaDataSource: address API council comments
 2015-05-14 22:01:54 +00:00
Christopher Tate
98fa656f16 fullBackupContent isn't public API 
Bug 21090205

Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
 2015-05-14 15:01:45 -07:00
Paul McLean
f62c7428e7 Change AudioDevicesInfo.getFormats() to getEncodings(). 
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
 2015-05-14 14:57:08 -07:00
Lajos Molnar
22ade0585b am e33a0cf6: am 6500bbd4: am 51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev 
* commit 'e33a0cf6bb95aa1037861e1a58084583a225e592':
  media: remove setPlaybackRate from MediaPlayer and MediSync
 2015-05-14 21:44:01 +00:00
Zhijun He
492afe9014 Merge "Image/Reader/Writer: address API review comments" into mnc-dev 2015-05-14 21:44:01 +00:00
Lajos Molnar
7fc0114e51 am a949e442: am 879d52f1: am af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev 
* commit 'a949e442c402d3c0e83800090c176c6fba89ef20':
  media: change final fields to accessors in MediaTimestamp
 2015-05-14 21:43:55 +00:00
Zhijun He
d99dc329b9 Image/Reader/Writer: address API review comments 
* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils

Bug: 21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c
 2015-05-14 14:35:57 -07:00
Chong Zhang
7fc802bbf7 Merge "MediaDataSource: address API council comments" into mnc-dev 2015-05-14 21:29:52 +00:00
Chien-Yu Chen
10c74ae669 am 6f9e7a55: am ca0d787f: am 3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 
* commit '6f9e7a556781a1dbf0ecf6d8a6744f04fed8c2ae':
  Camera2: Fix reprocessing API naming and docs
 2015-05-14 21:27:01 +00:00
Mikhail Naganov
d0f730e970 am 99b972c5: am 993a0f70: am 93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev 
* commit '99b972c5441c960c14adbb9287c5e4355282dda4':
  Tiny fix after updating the error reporting API
 2015-05-14 21:26:55 +00:00
Yorke Lee
d7744fe48b am e27b3c63: am eb497822: am 0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev 
* commit 'e27b3c6345d9e4698c43fb7edf28c4fc8e1f8bd4':
  Make Conferenceable an abstract class
 2015-05-14 21:25:14 +00:00
Daniel Sandler
523da50a32 am b5b114a3: am 15de90de: am 9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev 
* commit 'b5b114a3f032ab2f56553741c4bed303de37fb8d':
  Revert "Icon support comes to Notification."
 2015-05-14 21:24:49 +00:00
Paul McLean
2fc1bb1d24 am 3cdb4be6: am b0f9f7b8: am f799491f: Merge "New policy for internal and wired device names." into mnc-dev 
* commit '3cdb4be6898d34ea54a63657fcdebdf957bd8e93':
  New policy for internal and wired device names.
 2015-05-14 21:24:38 +00:00
Michael Wright
bbea695462 am 27a24555: am edc7560a: am 1b2e5c11: Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 
* commit '27a2455506ee418349be4c5e7f958377daee4a29':
  Revert "Revert "Add new MotionEvent actions for button press and release.""
 2015-05-14 21:24:17 +00:00
Zoltan Szatmary-Ban
c01ef2a29a am dabd7d90: am 392f8ff5: am 39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 
* commit 'dabd7d90151dc6061f6d4bbc94eb45ee79fb78c5':
  Rename NetworkUsageStats -> NetworkStats
 2015-05-14 21:24:11 +00:00
Michael Wright
3f9c6f871e am c52a5959: am 87d3e2f4: am 3d528698: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 
* commit 'c52a59597b7cf98fbe8ff5208e1f71592b27d43e':
  Revert "Add new MotionEvent actions for button press and release."
 2015-05-14 21:23:24 +00:00
Michael Wright
c504d4501e am 0a998bd7: am ce0b8585: am 07b83f1c: Merge "Add new MotionEvent actions for button press and release." into mnc-dev 
* commit '0a998bd7608ea5a746e35cc440cfcd000d249c9c':
  Add new MotionEvent actions for button press and release.
 2015-05-14 21:23:18 +00:00
Chong Zhang
bc10185fa1 MediaDataSource: address API council comments 
- throw IOExecption on fatal errors

- add offset argument to readAt

- and fix a crash in MediaExtractor

bug: 21045118
bug: 21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
 2015-05-14 14:19:01 -07:00