Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,027 Commits 3 Branches 0 Tags
abb81817eacafdfd9a03896f472ea25d4a987d3f
Commit Graph

39006 Commits

Author SHA1 Message Date
Matthew Williams
abb81817ea am a54edd7e: Merge "TaskManager API first pass." 
* commit 'a54edd7eb31e641630d594de37b3ee9ce6ddfa61':
  TaskManager API first pass.
 2014-05-01 17:49:34 +00:00
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +00:00
Alexandra Gherghina
10285c6a92 am 8bb3003f: Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 
* commit '8bb3003fca6a678fb3df524ed6779dc9210fca86':
  Revert "Temporarily switch off returning only enabled profiles to support dogfooding"
 2014-05-01 15:53:54 +00:00
Alexandra Gherghina
973a1d2741 Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 2014-05-01 15:42:07 +00:00
George Mount
e9755a3fba am fa509392: Merge "Fixed transition start delay propagation when duration = 0." 
* commit 'fa50939227fc4f1c032229b63291ddb0447e3f9c':
  Fixed transition start delay propagation when duration = 0.
 2014-05-01 14:49:41 +00:00
George Mount
794853f61c Merge "Fixed transition start delay propagation when duration = 0." 2014-05-01 14:44:03 +00:00
Narayan Kamath
86a38d235a am afbbbfc0: Fix build. 
* commit 'afbbbfc01a1c00f304b5bbae3406afcdc4ed5185':
  Fix build.
 2014-05-01 14:41:42 +00:00
Narayan Kamath
4948f0eee8 Fix build. 
Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16
 2014-05-01 15:37:15 +01:00
George Mount
3d3e681bac am 7056c7e7: Merge "Fix "blink" when going "back" quickly after entering Activity." 
* commit '7056c7e7f4393cc80b450b38e327524db95832f6':
  Fix "blink" when going "back" quickly after entering Activity.
 2014-05-01 14:18:22 +00:00
George Mount
8df5a07d88 Merge "Fix "blink" when going "back" quickly after entering Activity." 2014-05-01 14:13:01 +00:00
George Mount
265f209d55 Fixed transition start delay propagation when duration = 0. 
Bug 14443184

Also gave the propagation speed a tweak to make it more
obvious that there is a propagation.

Change-Id: If9dc3172ae6ce7e6a712ccd1b83ebec9bf880bfa
 2014-05-01 07:11:52 -07:00
Narayan Kamath
da3595252b am eceea503: am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit 'eceea503c02075921516653c770483d987d9f36f':
  Implement FileUtils#contains.
 2014-05-01 14:04:37 +00:00
Narayan Kamath
2e2c7d2325 am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit '6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
  Implement FileUtils#contains.
 2014-05-01 14:00:25 +00:00
Narayan Kamath
6af42aea72 am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.
 2014-05-01 13:57:13 +00:00
Narayan Kamath
9f34234f1c am b916d8ad: Merge "Implement FileUtils#contains." 
* commit 'b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
  Implement FileUtils#contains.
 2014-05-01 13:52:55 +00:00
Narayan Kamath
d6d1dbac3f Implement FileUtils#contains. 
Partial cherry-pick of changes 4ca728c0 and 21de56a9, which
can't be cherry-picked due to their large surface area.

Change-Id: Ife46e150d360cd5241dea93863141749233c1805
 2014-05-01 14:01:44 +01:00
Alexandra Gherghina
cc275f3444 am 169ebe98: Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager" 
* commit '169ebe98aeb8d1f725208da92585bc7a7a99aff8':
  Adds an enabled state in UserInfo instead of DevicePolicyManager
 2014-05-01 10:52:32 +00:00
Alexandra Gherghina
3c4d9c56db Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager" 2014-05-01 10:49:21 +00:00
Yohei Yukawa
09ffc826cc am fdbedeb6: Merge "Add unit tests for InputMethodSubtypeSwitchingController" 
* commit 'fdbedeb6f365fcbb9ab796ed5953d35ef3f3978a':
  Add unit tests for InputMethodSubtypeSwitchingController
 2014-05-01 10:38:28 +00:00
Alexandra Gherghina
df35d570ed Adds an enabled state in UserInfo instead of DevicePolicyManager 
Bug: 14377459
Change-Id: Ib4ec43d87da96c3dddaf9b7ae1796f261863a182
 2014-05-01 11:34:27 +01:00
Yohei Yukawa
8596f6998e Merge "Add unit tests for InputMethodSubtypeSwitchingController" 2014-05-01 10:34:05 +00:00
Yohei Yukawa
d1da115298 Add unit tests for InputMethodSubtypeSwitchingController 
This CL adds unit tests for InputMethodSubtypeSwitchingController
as a ground work to make it aware of
supportsSwitchingToNextInputMethod in a subsequent CL.

This CL never changes existing behavior.

BUG: 12981505
Change-Id: I3b2c46c47c7686b811fa248ad549f20875367425
 2014-05-01 19:13:25 +09:00
Nicolas Prevot
6483a805d4 am 4cd07224: Merge "Introduce forwarding intents across profiles." 
* commit '4cd07224df582d6b6f9be5b1d04ab65bbd00d3f7':
  Introduce forwarding intents across profiles.
 2014-05-01 09:20:35 +00:00
Nicolas Prevot
ff2e05e1f6 Merge "Introduce forwarding intents across profiles." 2014-05-01 09:17:13 +00:00
George Mount
1a5b294d39 Fix "blink" when going "back" quickly after entering Activity. 
Bug 14445508

Activity Transitions would occasionally blink to black when
going "back." This was caused because the convertToTranslucent
callback was slow to come and could occur during the exit
transition while going back.

Change-Id: I17db25197926399dc22b50c595416dfa7b32b026
 2014-04-30 16:59:31 -07:00
Michael Wright
8f04cd6cb2 am d404631d: am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit 'd404631d178edef95170b89f9613318a989cbbfa':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 23:32:55 +00:00
Michael Wright
a2dc6fab5e am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '474b07497bf1a33ccc889d21287269cd40dc0cf4':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 23:28:28 +00:00
Kristian Monsen
18b9812ba3 am 1efcbb7b: Merge "Try to not start up chromium when not needed" 
* commit '1efcbb7bbdeac3540aa418de7c39f74da32d1a19':
  Try to not start up chromium when not needed
 2014-04-30 21:45:35 +00:00
Kristian Monsen
b56ddaaf0e Merge "Try to not start up chromium when not needed" 2014-04-30 21:40:31 +00:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:11:05 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +00:00
Nicolas Prevot
10fa67c77e Introduce forwarding intents across profiles. 
The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.

When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.

Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
 2014-04-30 19:24:52 +01:00
Kenny Guy
76f08ee7df am 56afa6d5: Merge "Extend LauncherApps service to expose enabled state." 
* commit '56afa6d53216541aa397b051ab74c130f488cd96':
  Extend LauncherApps service to expose enabled state.
 2014-04-30 17:39:33 +00:00
Kenny Guy
7e5264ced7 Merge "Extend LauncherApps service to expose enabled state." 2014-04-30 17:38:10 +00:00
Alexandra Gherghina
f2e7b3f56a Revert "Temporarily switch off returning only enabled profiles to support dogfooding" 
This reverts commit 199c35a21ea9bddde80fdb435ec604f729b0cbe7 because client code has been updated.

Bug: 14132551
Change-Id: I7159087dfaded6f2bfe90ef103f74b242acb166c
 2014-04-30 17:01:03 +00:00
Dianne Hackborn
c96190e9fe am c6890f9f: Merge "Switch IProcessObserver to report process state" 
* commit 'c6890f9f517f7b09594ebb6aaf5b338fb905b32f':
  Switch IProcessObserver to report process state
 2014-04-30 16:43:13 +00:00
Dianne Hackborn
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +00:00
George Mount
b0b8c005d7 am 50642dc0: Merge "Fix NPE when going "back" from Activity Transition." 
* commit '50642dc0c1d2942113e8a2880f0c709af43463a3':
  Fix NPE when going "back" from Activity Transition.
 2014-04-30 14:30:29 +00:00
George Mount
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +00:00
Youngsang Cho
a17703ce4f am a6edd3ed: Merge "Explictly release the surface in TV input framework" 
* commit 'a6edd3ed2caf732359ce1156f5881b5ab35f13cc':
  Explictly release the surface in TV input framework
 2014-04-30 11:10:10 +00:00
Youngsang Cho
36c492cf1a Merge "Explictly release the surface in TV input framework" 2014-04-30 11:07:29 +00:00
Youngsang Cho
f836206818 Explictly release the surface in TV input framework 
Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
 2014-04-30 20:05:32 +09:00
Narayan Kamath
0e4fa6ea7b am b4d35dc8: Package manager changes for dual zygote stack. 
* commit 'b4d35dc8e9702f9d0d82d35a105f0eea35672b52':
  Package manager changes for dual zygote stack.
 2014-04-30 10:10:40 +00:00
Allen Shen
1c0f21ea84 WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent 
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer

Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
 2014-04-30 17:09:19 +08:00
Narayan Kamath
0f206a149d Package manager changes for dual zygote stack. 
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

Change-Id: I4f380b146137803e51d56fdf355c3bdfc92c409d
 2014-04-30 09:43:31 +01:00
John Spurlock
cee5dc7f2a am 8a479715: Merge "Zen mode tweaks." 
* commit '8a479715185b7c5e6e2907ffbac8243429ce39a1':
  Zen mode tweaks.
 2014-04-30 01:56:19 +00:00
Bill Yi
d21082ca0c am 9a76e9ba: Fix build error 
* commit '9a76e9ba1adbdf7cc431b1e6fe454cf0c5d900de':
  Fix build error
 2014-04-30 01:55:23 +00:00
John Spurlock
aa2112f671 Merge "Zen mode tweaks." 2014-04-30 01:53:09 +00:00
Bill Yi
9a76e9ba1a Fix build error 
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
 2014-04-29 18:52:48 -07:00