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

188432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
39606e9f78 am 7b09e7a9: am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '7b09e7a9f3ef804e9cd159023b64eac1ef8b7931':
  Fix UB in ResourceTable::stringToInt.
 2015-04-15 00:07:01 +00:00
Jeff Sharkey
4c08b1bab2 Merge "Checkpoint of storage notifications." 2015-04-15 00:02:13 +00:00
Ben Gruver
df0db7fe83 Merge "Don't verify signatures in ConfigUpdateInstallReceiver" 2015-04-14 23:56:34 +00:00
Dan Albert
7b09e7a9f3 am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d':
  Fix UB in ResourceTable::stringToInt.
 2015-04-14 23:55:35 +00:00
Andres Morales
fcfff2842a Merge "Add notify keystore method to FPS JNI" 2015-04-14 23:55:00 +00:00
Chong Zhang
b6e809bfab Merge "MediaRecorderTest: verify capture fps meta key is set" 2015-04-14 23:54:18 +00:00
Andres Morales
af0479d16d Add notify keystore method to FPS JNI 
Change-Id: I0b29a9e4a15e9386586df98be419be9e0b0c8f7b
 2015-04-14 23:52:08 +00:00
Jeff Sharkey
56bd312913 Checkpoint of storage notifications. 
Rewrite of storage notifications to support multiple disks/volumes,
handling the state of each independently.  Update strings to match
spec.  Include actions to jump into wizard when adoptable, otherwise
browse or eject.

Move browse intent creation to common place on VolumeInfo.  Also add
well-formed extra names.  VolumeInfo now carries the parent disk ID
along with it to avoid races when unmounting.

Bug: 19993667
Change-Id: I236ddc7f8112490355f438b828bec8d40c331fdd
 2015-04-14 16:46:27 -07:00
Amith Yamasani
d1500d8ff1 Merge "Always set the dataDir for the given userId" 2015-04-14 23:45:13 +00:00
Dan Albert
44d7989abf am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '571c5a26f767f67118f34ca0d426aeeb4a287b2c':
  Fix UB in ResourceTable::stringToInt.
 2015-04-14 23:44:51 +00:00
Yorke Lee
3ba6474e3e Merge "Hide Phone proximity sensor methods" 2015-04-14 23:37:45 +00:00
Dan Albert
571c5a26f7 Merge "Fix UB in ResourceTable::stringToInt." 2015-04-14 23:25:27 +00:00
Sasha Levitskiy
f4f2693fc9 Merge "Fingerprint: Add hw token to the enroll() function." 2015-04-14 22:53:15 +00:00
Sasha Levitskiy
7ba38ef0df Fingerprint: Add hw token to the enroll() function. 
Change-Id: I3308a2567cac9290540bb7692d343ccad98b40ed
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-04-14 15:48:30 -07:00
Amith Yamasani
1742cfbd8a Always set the dataDir for the given userId 
Don't try to optimize for userId != 0 when generating the
ApplicationInfo.

Change-Id: I2eb2d43f36677a781643a1e86a19c8850d517411
 2015-04-14 15:41:20 -07:00
Adam Powell
a87cc375f1 Merge "Add ComponentName.createRelative methods" 2015-04-14 22:38:23 +00: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
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
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
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
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