Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,321 Commits 3 Branches 0 Tags
c3974f28cb052d501accfb40f13420ce820def50
Commit Graph

10829 Commits

Author SHA1 Message Date
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
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
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
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
Lajos Molnar
51bf5d9c07 Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev 2015-05-14 21:17:31 +00:00
Lajos Molnar
af0479446b Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev 2015-05-14 21:17:30 +00:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Mikhail Naganov
6162eafe7a Tiny fix after updating the error reporting API 
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.

Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
 2015-05-14 13:30:13 -07:00
Lajos Molnar
05a822161f media: change final fields to accessors in MediaTimestamp 
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
 2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8 media: remove setPlaybackRate from MediaPlayer and MediSync 
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.

Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
 2015-05-14 12:16:44 -07:00
Robin Lee
3c1b55f1d6 am af1985b3: am f8bb8595: am 39087b1c: Replace String host:port/url args with Uri arg 
* commit 'af1985b3170f9c49353457f60d708a1826e37635':
  Replace String host:port/url args with Uri arg
 2015-05-14 18:04:18 +00:00
Yorke Lee
0125d76fa3 Merge "Make Conferenceable an abstract class" into mnc-dev 2015-05-14 17:32:45 +00:00
Dan Sandler
02cd9f91a6 Use Context instead of Resources in Icon.createWithResource. 
This works around situations where corrupted packages cause
Resources.getResourcePackageName to return something that
does't actually work.

Bug: 21144636
Change-Id: I271518599a8eb89d493f1ceda6cb2e47fb38a4ff
 2015-05-14 13:23:12 -04:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification." 
This reverts commit 08a04c1524.
This also reverts commit 5bcbf857d1.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
 2015-05-14 12:23:24 -04:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Michael Wright
1b2e5c11b6 Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 2015-05-14 15:31:14 +00:00
Zoltan Szatmary-Ban
39b8c69a23 Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 2015-05-14 15:13:34 +00:00
Michael Wright
5bd69e6e61 Revert "Revert "Add new MotionEvent actions for button press and release."" 
This reverts commit 9623805162.
 2015-05-14 14:48:08 +01:00
Michael Wright
3d52869834 Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 2015-05-14 13:47:10 +00:00
Michael Wright
9623805162 Revert "Add new MotionEvent actions for button press and release." 
This reverts commit ec0ce51b73.
 2015-05-14 14:46:25 +01:00
Michael Wright
07b83f1c9e Merge "Add new MotionEvent actions for button press and release." into mnc-dev 2015-05-14 13:31:29 +00:00