Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,025 Commits 3 Branches 0 Tags
6495ef975f330d07370da46f69a7e808b3177467
Commit Graph

192025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
6495ef975f Merge "Fix build." into mnc-dev 2015-05-14 00:36:58 +00:00
Jorim Jaggi
6a587acd1d Merge "Fix fingerprint for multiuser" into mnc-dev 2015-05-14 00:36:03 +00:00
Dianne Hackborn
4be8c4cc4c Fix build. 
Change-Id: I94c7e3033721c1d8024a212614752512e685289b
 2015-05-13 17:35:42 -07:00
Andy Hung
1864460bf3 Merge "Allow partial playback parameter settings in AudioTrack" into mnc-dev 2015-05-14 00:21:23 +00:00
Robert Greenwalt
5703ef5bf8 Merge "Add support for static RadioCapabilities." into mnc-dev 2015-05-14 00:07:10 +00:00
Robert Greenwalt
8c621ef546 Add support for static RadioCapabilities. 
Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY.  Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that.  B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
 2015-05-13 17:04:03 -07:00
David Friedman
3ac457420a am 3ccf0caf: am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit '3ccf0caf015034976f8c654d89ac74619aa94bd0':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-14 00:00:10 +00:00
Chris Craik
6b4ace298e Merge "Add back alpha atrace log" into mnc-dev 2015-05-13 23:53:48 +00:00
Chris Craik
1a0808e64c Add back alpha atrace log 
bug:20922838

Change-Id: I70ccbffdd5f140cd1dd71fbf456fb5b085e74a4a
 2015-05-13 16:47:19 -07:00
David Friedman
3ccf0caf01 am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit '7fc3b6c00b55e15881d1f098666399b674a64e42':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:46:36 +00:00
Svet Ganov
67b7ec2887 Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev 2015-05-13 23:45:23 +00:00
Robert Shih
55e6ad78a0 Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev 2015-05-13 23:36:51 +00:00
Jorim Jaggi
aa4d32add7 Fix fingerprint for multiuser 
Change-Id: Iab18c4de9764da1a65490b186b33535f8e79e1e5
 2015-05-13 16:35:56 -07:00
Alan Viverette
bf6d50f906 Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 2015-05-13 23:35:55 +00:00
David Friedman
7fc3b6c00b am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit 'abd8d42225f58396abaef2cf0e8a604be111e683':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:30:41 +00:00
Dianne Hackborn
4f5e024875 Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev 2015-05-13 23:29:30 +00:00
Ihab Awad
24145d451b Merge "Refactor StatusHints (1/3)" into mnc-dev 2015-05-13 23:26:05 +00:00
Fabrice Di Meglio
fe112e7b38 Merge "Add IntentFilter auto verification - part 10" into mnc-dev 2015-05-13 23:20:47 +00:00
Robert Shih
b7514effd1 MediaPlayer/TimedMetaData: API updates related to timed metadata 
- renamed MediaPlayer.*OnTimedMetaData* to *OnTimedMetaDataAvailable*
- added `final` modifier to TimedMetaData class
- added javadocs for TimedMetaData public methods
- renamed private members and cooresponding accessors for TimedMetaData
- reworded existing TimedMetaData javadoc

Bug: 21045118
Change-Id: If0113307fce08083226fc7f64c4fe6f93553d899
 2015-05-13 16:19:51 -07:00
Fabrice Di Meglio
649efc68cb Add IntentFilter auto verification - part 10 
- tune Intent resolution candidates filtering: remove the undefinedList
from the results and then add it again it there is no more candidates.

See bug #19628271

Change-Id: I9ab077f6a431367be8bab30c134d34e1e7ac51ed
 2015-05-13 16:17:11 -07:00
David Friedman
abd8d42225 am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit 'f5d6156ce8e56eb92abcf046fd8ff5a9647d38ae':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:16:41 +00:00
Ihab Awad
a7684ed638 Refactor StatusHints (1/3) 
Refactor StatusHints to use the new Icon class.

Bug: 21040387
Change-Id: I3e7aae38127294b46859efb6a2aec71cf90e0e2a
 2015-05-13 16:16:11 -07:00
Lajos Molnar
907d8afd6b Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev 2015-05-13 23:01:28 +00:00
David Friedman
f5d6156ce8 Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 2015-05-13 23:00:38 +00:00
David Friedman
3518e60498 Docs: NDK r10e changes to publish to DAC. 
Change-Id: Id178523df1d5524bb25d43e304591526e6488b92
 2015-05-13 15:42:32 -07:00
Svet Ganov
f7e9cf4fb4 Access mock location is no longer a runtime permission - framework 
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.

bug:21078873

Change-Id: I19e3f9dc7c7de82eab46b30fec1abfbca54a0e59
 2015-05-13 15:37:21 -07:00
Selim Gurun
af9d60af0d Merge "Address API feedback for PostMessage" into mnc-dev 2015-05-13 22:37:02 +00:00
Jorim Jaggi
11274bb3e4 Merge "Fix build" into mnc-dev 2015-05-13 22:36:01 +00:00
Jorim Jaggi
2bf49b1a9f Fix build 
Change-Id: Ia9277c6c983758d301c89312e39b59a2db0b29c4
 2015-05-13 15:34:50 -07:00
Nick Kralevich
9831fad676 Merge "Modify how USB connections are handled." into mnc-dev 2015-05-13 22:31:57 +00:00
Dianne Hackborn
b725894d05 Hide getPackageProcessState(), it is not ready yet. 
Change-Id: I188c647573207e89510174e3ad56ca0c19e5ece3
 2015-05-13 15:27:23 -07:00
Andy Hung
973b8851ee Allow partial playback parameter settings in AudioTrack 
Change-Id: Ifb12c85312e25aa74da47fe0eae2d5b1fa4bb23b
 2015-05-13 15:17:36 -07:00
Jorim Jaggi
645edef483 Merge "Make sure the app can draw a frame before unlocking" into mnc-dev 2015-05-13 22:13:27 +00:00
Junda Liu
4d0f2afdc4 Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev 2015-05-13 22:13:24 +00:00
Junda Liu
6c217a25a4 Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense. 
Bug: b/21028396
Change-Id: I4905a1d1db247955ae7fa00a7f5ddfd7337ba5a8
 2015-05-13 15:11:10 -07:00
Yohei Yukawa
5ad7fe4930 Merge "Update IME focus when the active view is losing the focus." into mnc-dev 2015-05-13 22:10:37 +00:00
Junda Liu
07e02b6d25 Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev 2015-05-13 22:09:22 +00:00
Hui Shu
7b1b3613b9 Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev 2015-05-13 22:07:55 +00:00
Jonathan Basseri
b731c3d944 Add null annotations for getting carrier config. 
CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
 2015-05-13 14:58:28 -07:00
Junda Liu
cd115b738c Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense. 
Bug: b/21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
 2015-05-13 14:57:48 -07:00
Nancy Chen
782509076b Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 2015-05-13 21:54:48 +00:00
Jae Seo
ae649b1af8 Merge "TIF: API Review: android.media.tv" into mnc-dev 2015-05-13 21:44:01 +00:00
Alan Viverette
4f4855bca8 Merge "Use drawableStart in dialog list item so we can set padding" into mnc-dev 2015-05-13 21:44:00 +00:00
Lajos Molnar
6b7ef3725e media: rename MediaCodec.setSurface to setOutputSurface 
Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
 2015-05-13 14:43:33 -07:00
Adam Lesinski
4ee67bc7a7 Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev 2015-05-13 21:43:00 +00:00
Jorim Jaggi
ae8fcaf4c3 Merge "Use platform delay for assist long press gesture" into mnc-dev 2015-05-13 21:42:16 +00:00
Adam Lesinski
45fefaef00 Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev 2015-05-13 21:41:47 +00:00
Adam Lesinski
68727a0b20 Merge "AAPT2: inferred style parent processing" into mnc-dev 2015-05-13 21:40:24 +00:00
Adam Lesinski
79e04686f6 Merge "AAPT2: Support static lib referencing static lib" into mnc-dev 2015-05-13 21:38:02 +00:00
Alex Klyubin
87cca291bd Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev 2015-05-13 21:36:17 +00:00