188532 Commits

Author SHA1 Message Date
Adam Powell
a87cc375f1 Merge "Add ComponentName.createRelative methods" 2015-04-14 22:38:23 +00:00
John Reck
c294d128d0 A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-14 15:38:22 -07:00
Amith Yamasani
6f63bb0052 Merge "Handle null package argument" 2015-04-14 22:37:26 +00:00
Amith Yamasani
abedd3890b Handle null package argument
Null package passed in during charging implies all sync adapters
can now be synced.

Bug: 20066058
Change-Id: Ic5927893e52f7324083bdd63afa69d3bde7349de
2015-04-14 15:34:32 -07:00
Adam Powell
ecee322e59 Add ComponentName.createRelative methods
In a number of places, it's convenient to be able to refer to
ComponentName classes with relative package paths as they are
interpreted in manifest parsing. Express the official (yet simple)
policy for this in a simple pair of factory methods for ComponentName.

Change-Id: I81a40c81b7975445dd9f06292363b69bb072b16d
2015-04-14 15:20:16 -07:00
Yorke Lee
0604427a25 Changes for TelecomManager API review
* clearAccounts -> clearPhoneAccounts
* handleMMi(PhoneAccountHandle, String) -> handleMMi(String, PhoneAccountHandle)
* hasMultipleCallCapableAccounts -> removed
Bug: 20160799

Change-Id: Ifcd26474f04b71aa725299b6016004151b76bc31
2015-04-14 15:16:59 -07:00
Jean-Michel Trivi
cc98c67ef7 Define AudioMix state constants
Bug 20226914

Change-Id: Ie513fcdaaffd4ae3ed7fbd8d24fe8683959739e3
2015-04-14 15:10:30 -07:00
Ronghua Wu
4fd31a2a71 media: Add reason to CodecException.
Bug: 19620911
Change-Id: Ic7244a2369a04bfd69e703415a8c9aacdcbf3c57
2015-04-14 15:00:32 -07:00
David Christie
b808440014 Ensure GeofenceHardware will return capabilities for old implementations.
New FLP HAL implementations will explicitly return their capabilities,
but old versions won't (the implicit capability in old versions was
GNNS).  Ensure that the getCapabilities feature of GeofenceHardware
will return GNNS for old binaries, so GmsCore doesn't have to worry
about versioning.

Change-Id: I4b1c942b0d68d87bfbb18b8c06fd9d8b8f68efa6
2015-04-14 14:54:48 -07:00
Alex Klyubin
2eabe5b7a9 Merge "resolved conflicts for merge of 1d5a2592 to master" 2015-04-14 21:38:03 +00:00
David Christie
71bcd2aa5c Merge "Add versioning to FLP HAL." 2015-04-14 21:37:02 +00:00
Alex Klyubin
338e74648d resolved conflicts for merge of 1d5a2592 to master
Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6
2015-04-14 14:23:07 -07:00
Jorim Jaggi
7caa691652 Merge "Fix fingerprint API for 3rd party apps" 2015-04-14 21:12:27 +00:00
Ronghua Wu
41eedcf311 Revert "media: add new MediaCodec Callback onCodecReleased."
This reverts commit 4c302e8b141cd490733130e86e44fa4f216de457.

Change-Id: I563ba6419cf61968bf356c5b096445dde55abac2
2015-04-14 21:12:07 +00:00
Jorim Jaggi
ccdfa93f60 Fix fingerprint API for 3rd party apps
Change-Id: Id68d04b4deef9940a683d2b40f1db231845b00e3
2015-04-14 14:02:16 -07:00
Alan Viverette
bd1c50d1d0 Merge "Don't crash if an application has an invalid icon" 2015-04-14 20:56:53 +00:00
Alex Klyubin
1d5a259276 am 6a38c86d: am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
* commit '6a38c86dd892b272a354d2b1164e78eebaaf907e':
  No need to specify EC curve name in EcIesParameterSpec.
2015-04-14 20:55:34 +00:00
Alex Klyubin
8e5fbc70e1 am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional."
* commit 'fa2bd4fe5c10b8132a155f0f8d0207435ca2c8dc':
  Make specifying self-signed cert parameters optional.
2015-04-14 20:43:54 +00:00
Alex Klyubin
6a38c86dd8 am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
* commit 'd693690aee3ee94878ab59ee86d8db8ce5bb3789':
  No need to specify EC curve name in EcIesParameterSpec.
2015-04-14 20:43:46 +00:00
Alex Klyubin
fa2bd4fe5c am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional."
* commit '888f5cb7166936f468831d64ac88197c15f0584f':
  Make specifying self-signed cert parameters optional.
2015-04-14 20:31:02 +00:00
Alex Klyubin
d693690aee Merge "No need to specify EC curve name in EcIesParameterSpec." 2015-04-14 20:22:52 +00:00
Alex Klyubin
888f5cb716 am ecfda064: Merge "Make specifying self-signed cert parameters optional."
* commit 'ecfda06461b8c4a770eb47edb2f7052d7bd0c62d':
  Make specifying self-signed cert parameters optional.
2015-04-14 20:20:57 +00:00
Joe Fernandez
110020229e am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
  docs: Add Cross-References to Material Design Spec
2015-04-14 20:14:32 +00:00
Joe Fernandez
5b6e91a671 am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
  docs: Add Cross-References to Material Design Spec
2015-04-14 20:04:56 +00:00
John Spurlock
1740c625c6 Merge "Zen: Enter alarms only on volume down from vibrate." 2015-04-14 20:00:42 +00:00
John Spurlock
691ae9dc25 Merge "Zen: Add new user introduction msg for "Priority only"." 2015-04-14 20:00:22 +00:00
Alex Klyubin
ecfda06461 Merge "Make specifying self-signed cert parameters optional." 2015-04-14 19:59:03 +00:00
Alex Klyubin
67d21aef98 Make specifying self-signed cert parameters optional.
This removes the need to specify the three parameters of the
self-signed certificate (serial number, subject, validity range) when
generating key pairs in AndroidKeyStore. This is achieved by
providing sensible defaults for these parameters:
* serial number: 1
* subject: CN=fake
* validity range: Jan 1 1970 to Jan 1 2048.

Bug: 18088752
Change-Id: I5df918b1ef8b26ed3ddd43828c4c78c9fa58cd43
2015-04-14 12:56:17 -07:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
2015-04-14 12:53:12 -07:00
Hiroshi Yamauchi
f8a713309a am d9e0abdf: am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit 'd9e0abdf85ad11a9689d3ded79745fe318e82971':
  Add Debug.getRuntimeStat().
2015-04-14 19:48:19 +00:00
Svetoslav
a3756407a6 Merge "Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed." 2015-04-14 19:39:01 +00:00
Hiroshi Yamauchi
d9e0abdf85 am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit '04143fdd55196886e5dbf1a1c7fe334115e81a42':
  Add Debug.getRuntimeStat().
2015-04-14 19:37:56 +00:00
Svetoslav
1441fc73e8 Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed.
These permissions are definded by the platform to protect the
subscribed feeds provider which is not in the system, neither
is its contract specified in the system. Both the contract and
the implementation of the provider are in GmsCore. Hence, this
permissions shuld be declared by GmsCore, not the system. Until
GmsCore adds the permissions we have to keep this as removed
but present in the implementation to keep apps that use the
provider working.

bug:20192150

Change-Id: I3f38b01a159bb430c30948b14de7cdaf5cb50772
2015-04-14 12:37:04 -07:00
Zheng Fu
5929b7b8f0 Merge "Add setting flag to enable new contact aggregator" 2015-04-14 19:36:43 +00:00
Yorke Lee
22244d0577 Hide Phone proximity sensor methods
Has to be done in master and not m-wireless-dev, because
m-wireless-dev doesn't contain system-api/23.txt.

Bug: 20160495
Change-Id: I910b3ecafd78c31081b38325b436b4f2b5a54c8d
2015-04-14 12:34:28 -07:00
Hiroshi Yamauchi
04143fdd55 am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit 'e38ee9df26c93415303152ec3f6ed50d847557c8':
  Add Debug.getRuntimeStat().
2015-04-14 19:26:51 +00:00
David Christie
cfc9b6d6ab Add versioning to FLP HAL.
Retain compatibility with implementations compiled
against old headers or left unchanged from LMP.

Change-Id: I3f7cfaaf0cba8697c312940a805b053c6040caa6
2015-04-14 12:14:03 -07:00
Hiroshi Yamauchi
e38ee9df26 Merge "Add Debug.getRuntimeStat()." 2015-04-14 19:08:30 +00:00
Dianne Hackborn
ca25b8768d Merge "Fixes to idle alarm scheduling, package importance." 2015-04-14 18:43:47 +00:00
Fyodor Kupolov
a08c444d1d Merge "Display a notification for a new guest" 2015-04-14 17:43:45 +00:00
Roozbeh Pournader
80003c6e9e Merge "Add more firstStrong alternatives for textDirection." 2015-04-14 17:41:18 +00:00
Fyodor Kupolov
f4d6ad2663 Display a notification for a new guest
Display a notification for a new guest, which includes information that they
are using the device as a guest and how to remove guest.

Bug: 16956833
Change-Id: I21711949d3a80eaca47251faa6ee0cf04b5bf3e6
2015-04-14 10:36:53 -07:00
Hiroshi Yamauchi
8b5a293d09 Add Debug.getRuntimeStat().
Export runtime stats (currently GC stats) through this method.

Bug: 19825248
Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
2015-04-14 10:33:10 -07:00
Chien-Yu Chen
7681fbb98e Merge "camera2: add reprocess support" 2015-04-14 17:29:46 +00:00
Benjamin Franz
3223106dab Fix a SecurityException in setKeyguardEnabledState
A SecurityException is currently thrown when calling this API as
LockPatternUtils.isSecure requires a permission that the DO does not
have.

Bug: 19533026
Change-Id: I28bebb647e46bb631cc4fa1a7c9571eadda69086
2015-04-14 18:19:49 +01:00
Roozbeh Pournader
452d6acb80 Merge "Support more smaller scripts of Asia and Africa." 2015-04-14 17:19:24 +00:00
Yang Ni
5024f20a85 am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '0933905375790eb850334b53fd6d0981bd40e007':
  Add name to ScriptGroup2.Builder.create() method
2015-04-14 17:02:33 +00:00
Dianne Hackborn
1e38382b54 Fixes to idle alarm scheduling, package importance.
- Add new API to ask the activity manager what the current
  importance of a particular package name is (along with a few
  new useful importance levels).

- Fix my last alarm manager change to actually execute the
  alarms we have now decided should run even while we are idle.

Change-Id: I1f14712b4e390770d53b185c96a1b36f6aadd687
2015-04-14 10:01:24 -07:00
Mady Mellor
b3a0660eab Merge "Use HandleView's previous offset for text selection handles" 2015-04-14 16:52:06 +00:00