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

188464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
c96e494ac7 Merge "DocumentsUI: Filter out downloads root if the source documents include directory." 2015-04-15 04:30:10 +00:00
Daichi Hirono
9be34298be DocumentsUI: Filter out downloads root if the source documents include directory. 
This is the short term solution for the downloads root, which does not support
directory creation. For the long term solution, we need to add a flag to Root
model to check if the root support directory creation or not.

BUG=20186663

Change-Id: I15c4795892f38e3f968776f732a6f2160ae775fc
 2015-04-15 13:27:55 +09:00
Keisuke Kuroyanagi
e26bd2c361 Merge "Fix crash when ellipsize="start" is applied to short line." 2015-04-15 04:04:46 +00:00
Tomasz Mikolajewski
3b5adaaca1 Merge "Add an initial version of the copy failure dialog to DocumentsUI." 2015-04-15 04:02:14 +00:00
Daichi Hirono
738ed14290 Merge "DocumentsUI: Polish buttons of copy destination dialog." 2015-04-15 04:00:02 +00:00
Daichi Hirono
de021abe40 DocumentsUI: Polish buttons of copy destination dialog. 
* Add cancel button to directory picker dialog.
* Turns "select" label to "copy to" label for copy destination picker.

BUG=20170953

Change-Id: I66214804aed75a6fccc716d1a01163c634e73d7f
 2015-04-15 12:57:53 +09:00
Tomasz Mikolajewski
61686593fd Add an initial version of the copy failure dialog to DocumentsUI. 
Change-Id: Ibdfde661aa5b636570c017d3d00565c193d595a3
 2015-04-15 12:39:27 +09:00
Joe Fernandez
3abfa03e37 am 808042e6: am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '808042e6c2244b24acb30c0f33439c730fa0acd7':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 02:16:55 +00:00
Jean-Michel Trivi
f14c535041 Merge "Define AudioMix state constants" 2015-04-15 02:05:44 +00:00
Andy Hung
8f08d04b4e Merge "Default to minimum buffer size for AudioRecord.Builder" 2015-04-15 01:54:20 +00:00
Ronghua Wu
0e08a225da Merge "media: Add reason to CodecException." 2015-04-15 01:40:52 +00:00
Andy Hung
864ae67852 Default to minimum buffer size for AudioRecord.Builder 
Add AudioRecord.getNativeFrameCount to allow apps to
retrieve the size of the buffer created.

Change-Id: I4c539677726f89afd36fe7b1d24c8b29ada91402
 2015-04-14 18:40:02 -07:00
Ronghua Wu
4823dee929 Merge "Revert "media: add new MediaCodec Callback onCodecReleased."" 2015-04-15 01:38:23 +00:00
Joe Fernandez
808042e6c2 am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit 'e635f9b5e078e9e6f15f5828832acffb497c05e7':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 01:15:23 +00:00
Joe Fernandez
e635f9b5e0 am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '726466c22517a1dc4d549edfd32fc5447794d29e':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:55:08 +00:00
Joe Fernandez
726466c225 am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '110020229e0a31b060a329dfe55181f98a31e802':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:45:20 +00:00
Hiroshi Yamauchi
c969424772 am 4bb374bb: am d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit '4bb374bb359c01055ad1f35a9424a12dcadd2d2b':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:40:27 +00:00
David Christie
377ac63a07 Merge "Ensure GeofenceHardware will return capabilities for old implementations." 2015-04-15 00:30:43 +00:00
Hiroshi Yamauchi
4bb374bb35 am d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit 'd83a598c392af8daf9c82f28b5c920955712f528':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:24:58 +00:00
Andres Morales
205bbc40b4 Fix build 
cast param

Change-Id: I150773ab0701c2551e3bd292aa228083259b5dd6
 2015-04-14 17:16:25 -07:00
Hiroshi Yamauchi
d83a598c39 am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit '82992b7270842637d1af3dcc7c9ae954bdfa312c':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:11:01 +00:00
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
Hiroshi Yamauchi
82992b7270 Merge "Fix javadoc error in Debug.getRuntimeStats()." 2015-04-14 23:49:03 +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
Hiroshi Yamauchi
d8001676ea Fix javadoc error in Debug.getRuntimeStats(). 
Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
 2015-04-14 16:08:49 -07: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
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