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

137704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
8d2d5c8d5c am 61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev 
* commit '61e4b1cf302ea659329952dfcebffb2f387bff3f':
  Add ClientState for handling the crash of clients.
 2014-06-03 17:16:49 +00:00
Alan Viverette
19212f4a86 am 23416c06: Fix build 
* commit '23416c06c4cb2dba437c4ef749857e085bc76d18':
  Fix build
 2014-06-03 17:16:43 +00:00
Chulwoo Lee
f573765bf1 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev 
* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
  Add a way to get the class name of SetupActivity and SettingsActivity
 2014-06-03 17:16:33 +00:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev 
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
 2014-06-03 17:16:27 +00:00
Dianne Hackborn
bcaffd0586 am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev 
* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
  Some battery stats history fixes.
 2014-06-03 17:16:01 +00:00
Raph Levien
690d45157d am faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 
* commit 'faa912037ca4895eb99155a4a53354435ee413c2':
  Support fallbacks for custom typefaces (Minikin)
 2014-06-03 17:15:56 +00:00
George Mount
d7954a8a29 am 5a745332: Merge "Delay sending shared element position until after layout." into lmp-preview-dev 
* commit '5a745332b3e5bac89052484e2ae4978a9a1e1bcd':
  Delay sending shared element position until after layout.
 2014-06-03 17:15:47 +00:00
Adam Powell
a5dd05f26f am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev 
* commit 'ef7c0948ea1379ee9f3f5f40267ca2cf5e76a36b':
  Add an internal method for setting optical insets.
 2014-06-03 17:15:34 +00:00
Jorim Jaggi
0db9a678a4 am a0437d35: Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev 
* commit 'a0437d355a853adb5023ab0885952620d0cf4f07':
  Hide header when notifications collide with it on Keyguard.
 2014-06-03 17:15:26 +00:00
Raph Levien
1044046aa9 am 8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev 
* commit '8e3605e4de5a109792acca22c37976ac52ee571e':
  Check for NULL on TypefaceImpl unref
 2014-06-03 17:15:21 +00:00
Nicolas Prevot
93d8c7259d Merge "Adding user consent extras to DevicePolicyManager." 2014-06-03 17:08:50 +00:00
Nicolas Prevot
3742ec394f Adding user consent extras to DevicePolicyManager. 
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager.
They can be used to tell ManagedProvisioning to skip user consent.

Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
 2014-06-03 17:07:34 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master 
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
 2014-06-03 17:06:58 +00:00
ztenghui
5e9a42588e Merge "Add the tree hierarchy for the group" 2014-06-03 16:03:37 +00:00
Nicolas Prevot
2808907362 Merge "Updating the pictures and labels for cross-profile intents." 2014-06-03 14:52:58 +00:00
John Reck
55ce00e7ef fix build 
Change-Id: I7fbe80ab0fbbc857c5785034a3c4129bccdec41c
 2014-06-03 07:42:52 -07:00
John Reck
7e3a7fc35f Merge "Remove GLRenderer" 2014-06-03 14:27:26 +00:00
Narayan Kamath
2cbc51f5ac am 00e3c58d: am 73f7cd98: Merge "Fix build." 
* commit '00e3c58d0232952bdcafd02f71e6c9fb00b4d248':
  Fix build.
 2014-06-03 14:11:55 +00:00
Narayan Kamath
00e3c58d02 am 73f7cd98: Merge "Fix build." 
* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
 2014-06-03 14:08:51 +00:00
Narayan Kamath
c32a244e90 am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs." 
* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
  Scan for renderscript files before deciding ABIs.
 2014-06-03 13:58:35 +00:00
Narayan Kamath
5770f2bfab am 797b109c: (-s ours) am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '797b109c60bda8e122075b0c2101d3f2a0b67c07':
  Add an --abi argument to "pm install"
 2014-06-03 13:58:30 +00:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
522a027806 am 41aa48be: am 032c5c05: Merge "Log process abis during start." 
* commit '41aa48beacc93a1511a290e91293402eeb787165':
  Log process abis during start.
 2014-06-03 13:29:04 +00:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs." 
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
 2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
 2014-06-03 13:24:45 +00:00
Narayan Kamath
41aa48beac am 032c5c05: Merge "Log process abis during start." 
* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.
 2014-06-03 13:24:34 +00:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00
Narayan Kamath
dad8f819a7 Merge "Add an --abi argument to "pm install"" 2014-06-03 12:01:53 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs. 
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
 2014-06-03 12:58:35 +01:00
Lorenzo Colitti
e4d7fc02ab Merge "Fix Legacy NetworkInfo API" 2014-06-03 11:58:24 +00:00
Narayan Kamath
7ed98c43f8 Merge "Add an --abi argument to "pm install"" 2014-06-03 11:10:02 +00:00
Robert Greenwalt
b90b20b5d5 Fix Legacy NetworkInfo API 
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
 2014-06-03 19:58:54 +09:00
Adrian Roos
f8053993c9 Merge "Remove now defunct touch analysis facility" 2014-06-03 10:46:43 +00:00
Narayan Kamath
116bdbd823 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd420536aaa9d93ae510a3151ccc4df1d)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
 2014-06-03 11:35:49 +01:00
Yuncheol Heo
71b197a0a3 Merge "Add SystemAudioAction(FromAvr|FromTv)." 2014-06-03 10:12:53 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
 2014-06-03 11:11:47 +01:00
Yuncheol Heo
63a2e0696c Add SystemAudioAction(FromAvr|FromTv). 
The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.

This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
  utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
  from removing the caller itself.

Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298
 2014-06-03 19:09:44 +09:00
Narayan Kamath
032c5c054c Merge "Log process abis during start." 2014-06-03 09:57:03 +00:00
Christopher Tate
c777185688 Finish migration of backup transport constants 
...and make sure to fix a couple of lingering Javadoc references.

Bug 15329632

Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6
 2014-06-02 19:10:54 -07:00
Christopher Tate
bfb131317b Merge "Add full-backup stream API to BackupTransport" 2014-06-03 02:07:01 +00:00
Christopher Tate
4dd2635bf5 Add full-backup stream API to BackupTransport 
Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.

The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.

Bug 15329632

Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a
 2014-06-02 18:57:21 -07:00
Robert Greenwalt
9e32be5d26 Merge "Refactor NetworkFactory." 2014-06-03 01:11:00 +00:00
Yohei Yukawa
083a3e6151 Merge "Reenable DynamicRotationList for language-switching-aware IMEs" 2014-06-03 00:51:32 +00:00
Sungsoo Lim
5a26f00c84 Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev 2014-06-03 00:23:09 +00:00
ztenghui
4d24caf1de Add the tree hierarchy for the group 
bug:15288554

Change-Id: I7caedb8466d078a0d9a6148e00d02eded4a4d234
 2014-06-02 17:18:10 -07:00
Alan Viverette
ad3c4a136e Fix build 
Change-Id: I09c649b3385ed46956f2d784546c430298de3069
 2014-06-02 17:12:58 -07:00
Sungsoo Lim
72ad7bf915 Add ClientState for handling the crash of clients. 
Bug: 15054040
Change-Id: I4dd8d1c350186fe705daa20c9944bc8e4dd556c2
 2014-06-03 09:09:14 +09:00
Chulwoo Lee
6abd0d801b Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev 2014-06-02 23:59:55 +00:00
Chulwoo Lee
e7bb7d6bb2 Add a way to get the class name of SetupActivity and SettingsActivity 
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
 2014-06-03 08:56:35 +09:00