OSDN Git Service
George Mount [Thu, 1 May 2014 14:13:00 +0000 (14:13 +0000)]
Merge "Fix "blink" when going "back" quickly after entering Activity."
Narayan Kamath [Thu, 1 May 2014 14:06:37 +0000 (14:06 +0000)]
am
5bc12a1b: (-s ours) am
a7b465ef: am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
5bc12a1b5dadfd504fb03875fad97cda8d39cf25':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 14:00:25 +0000 (14:00 +0000)]
am
6af42aea: am
9f34234f: am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
Implement FileUtils#contains.
Narayan Kamath [Thu, 1 May 2014 13:57:17 +0000 (13:57 +0000)]
am
a7b465ef: am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
a7b465efc4eede46b8dfc8932c6c30346e8e79de':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 13:57:13 +0000 (13:57 +0000)]
am
9f34234f: am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
Implement FileUtils#contains.
Narayan Kamath [Thu, 1 May 2014 13:52:59 +0000 (13:52 +0000)]
am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
d91358b2b977ef7c3551a486f51475c0441aba6e':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 13:52:55 +0000 (13:52 +0000)]
am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
Implement FileUtils#contains.
Narayan Kamath [Thu, 1 May 2014 13:51:08 +0000 (13:51 +0000)]
Merge "Support per-package lib dirs for bundled apps"
Narayan Kamath [Thu, 1 May 2014 12:35:34 +0000 (13:35 +0100)]
Support per-package lib dirs for bundled apps
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories. Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.
"apkname" here is the base name of the physical APK that holds the
package's code. For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider
Bug
13170859
(cherry picked from commit
addfbdc09ccf258395db8bfc510989a4c583f7ab)
Change-Id: Id82da78024a6325458b8b134d7d91ad0e5f0785e
Narayan Kamath [Thu, 1 May 2014 13:50:35 +0000 (13:50 +0000)]
Merge "Implement FileUtils#contains."
Narayan Kamath [Thu, 1 May 2014 13:01:44 +0000 (14:01 +0100)]
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
Narayan Kamath [Thu, 1 May 2014 11:01:34 +0000 (11:01 +0000)]
am
b6c04899: am
c8a045d4: am
41f40581: Merge "Fix x86 build in app_process."
* commit '
b6c04899e1ed614985d638b55dafe2c20e7b673a':
Fix x86 build in app_process.
Narayan Kamath [Thu, 1 May 2014 11:01:30 +0000 (11:01 +0000)]
am
fd30a0e7: (-s ours) am
ff34f6fa: am
27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit '
fd30a0e7b747eb4b781ef8def3008626f14eddfe':
Create arch specific cache dirs during zygote startup.
Alexandra Gherghina [Thu, 1 May 2014 10:49:21 +0000 (10:49 +0000)]
Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
Narayan Kamath [Thu, 1 May 2014 10:43:23 +0000 (10:43 +0000)]
am
c8a045d4: am
41f40581: Merge "Fix x86 build in app_process."
* commit '
c8a045d451522adab5226b0063f3a15d34542bf7':
Fix x86 build in app_process.
Narayan Kamath [Thu, 1 May 2014 10:43:19 +0000 (10:43 +0000)]
am
ff34f6fa: am
27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit '
ff34f6faaad21f5f72decc0b6a0bbde8dab68e29':
Create arch specific cache dirs during zygote startup.
Narayan Kamath [Thu, 1 May 2014 10:39:55 +0000 (10:39 +0000)]
am
41f40581: Merge "Fix x86 build in app_process."
* commit '
41f40581ee0284660d30be8ef28f6bf721c4ce10':
Fix x86 build in app_process.
Narayan Kamath [Thu, 1 May 2014 10:39:52 +0000 (10:39 +0000)]
am
27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit '
27b03e6272479ed82762a4a5d6e4be4f26c1ed58':
Create arch specific cache dirs during zygote startup.
Narayan Kamath [Thu, 1 May 2014 10:36:31 +0000 (10:36 +0000)]
Merge "Fix x86 build in app_process."
Narayan Kamath [Thu, 1 May 2014 10:36:27 +0000 (10:36 +0000)]
Merge "Create arch specific cache dirs during zygote startup."
Alexandra Gherghina [Wed, 9 Apr 2014 12:54:39 +0000 (13:54 +0100)]
Adds an enabled state in UserInfo instead of DevicePolicyManager
Bug:
14377459
Change-Id: Ib4ec43d87da96c3dddaf9b7ae1796f261863a182
Yohei Yukawa [Thu, 1 May 2014 10:34:05 +0000 (10:34 +0000)]
Merge "Add unit tests for InputMethodSubtypeSwitchingController"
Narayan Kamath [Wed, 30 Apr 2014 15:45:07 +0000 (16:45 +0100)]
Fix x86 build in app_process.
Look for __i386__ and not __x86__.
(cherry picked from commit
47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd)
Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
Narayan Kamath [Thu, 1 May 2014 10:27:18 +0000 (10:27 +0000)]
am
6c2e8062: am
70344223: am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
6c2e806200dc1a422aa681bfd78aae1eb8f1d508':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Fri, 25 Apr 2014 10:43:22 +0000 (11:43 +0100)]
Create arch specific cache dirs during zygote startup.
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.
(cherry picked from commit
da738713e4e2120a324e8ab6fd11aa0e54a3c66e)
Change-Id: I7472aa25c16a1cf95791af2bdf80ed0d73123872
Narayan Kamath [Thu, 1 May 2014 10:22:56 +0000 (10:22 +0000)]
am
70344223: am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
703442238200c2f1a35b51e7aadc693322feb69d':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Thu, 1 May 2014 10:18:11 +0000 (10:18 +0000)]
am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Thu, 1 May 2014 10:15:00 +0000 (10:15 +0000)]
Merge "Fix broken logging in Zygote.cpp."
Yohei Yukawa [Thu, 1 May 2014 08:20:05 +0000 (17:20 +0900)]
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
Narayan Kamath [Mon, 14 Apr 2014 13:46:07 +0000 (14:46 +0100)]
Fix broken logging in Zygote.cpp.
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.
Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
Robert Ly [Thu, 1 May 2014 09:45:33 +0000 (09:45 +0000)]
am
f05bef95: am
b76f7b35: am
8873025b: am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
f05bef95fb1dd612f099fe54da71e308a16e79e8':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 09:42:08 +0000 (09:42 +0000)]
am
b76f7b35: am
8873025b: am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
b76f7b35db0040591492f026d0dc17678141b6cf':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 09:37:01 +0000 (09:37 +0000)]
am
8873025b: am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
8873025b2a52ca1ecccfaa9840e82681e17900d4':
update wear stack notifications to coincide with devbyte code
Nicolas Prevot [Thu, 1 May 2014 09:17:12 +0000 (09:17 +0000)]
Merge "Introduce forwarding intents across profiles."
Robert Ly [Thu, 1 May 2014 08:22:05 +0000 (08:22 +0000)]
am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
f26a71003de069355931eab340433ba8345ba3f7':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 07:27:22 +0000 (07:27 +0000)]
Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
Robert Ly [Thu, 1 May 2014 07:23:42 +0000 (00:23 -0700)]
update wear stack notifications to coincide with devbyte code
Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b
Chris Craik [Thu, 1 May 2014 01:31:11 +0000 (01:31 +0000)]
Merge "Add more shadow control knobs"
Chris Craik [Thu, 1 May 2014 01:20:03 +0000 (18:20 -0700)]
Add more shadow control knobs
Change-Id: I1ff500bf429029a97b681ced9df652f4ee9f1332
Winson Chung [Thu, 1 May 2014 00:27:31 +0000 (00:27 +0000)]
Merge "Disable Filtering."
Winson Chung [Thu, 1 May 2014 00:26:28 +0000 (17:26 -0700)]
Disable Filtering.
Change-Id: I5c3aaaead7883b639ba24b28c04c1cafec0275c4
John Reck [Thu, 1 May 2014 00:07:44 +0000 (00:07 +0000)]
Merge "Add missing ifdefs"
John Reck [Wed, 30 Apr 2014 23:59:40 +0000 (16:59 -0700)]
Add missing ifdefs
Change-Id: I1c7c66cf81a31b56e6ae65d34b7936f9e8beec29
George Mount [Wed, 30 Apr 2014 23:59:31 +0000 (16:59 -0700)]
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
Jean-Michel Trivi [Wed, 30 Apr 2014 23:58:02 +0000 (23:58 +0000)]
Merge "Fix MediaFocusControl index management for PlayerRecord"
Ricardo Cervera [Wed, 30 Apr 2014 23:44:50 +0000 (23:44 +0000)]
am
6824e4e3: am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
6824e4e35164470c96cc4654afc88ccd179ac586':
docs: Added release notes for Android Studio 0.5.2
Elliott Hughes [Wed, 30 Apr 2014 23:35:39 +0000 (23:35 +0000)]
am
fd955f14: am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
fd955f14d6c87dffd1a20c36ad8001705495f831':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Deepanshu Gupta [Wed, 30 Apr 2014 23:35:07 +0000 (23:35 +0000)]
am
cd50f729: (-s ours) am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
cd50f7294654bf04195d9d1078a984ff9462093c':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 23:34:56 +0000 (23:34 +0000)]
am
006c2110: am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
006c211056d3a7561d2d97abae369603cc48e63a':
Make touch slop region smaller for watch
Michael Wright [Wed, 30 Apr 2014 23:28:28 +0000 (23:28 +0000)]
am
474b0749: am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
474b07497bf1a33ccc889d21287269cd40dc0cf4':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Elliott Hughes [Wed, 30 Apr 2014 23:19:03 +0000 (23:19 +0000)]
am
f84493ec: am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
f84493ec95bfce41106673645a3e56b185e54df5':
Fix for native leaks in YuvToJpegEncoder.cpp
Ricardo Cervera [Wed, 30 Apr 2014 22:40:00 +0000 (22:40 +0000)]
am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
8bef5ea70161586287ec06e9bd74b30604cd3f2c':
docs: Added release notes for Android Studio 0.5.2
Jean-Michel Trivi [Tue, 29 Apr 2014 23:11:36 +0000 (16:11 -0700)]
Fix MediaFocusControl index management for PlayerRecord
When updating the PlayerRecord stack on playstate changes and
media button event receiver registrations, evaluate the index
of the stack entry to remove against the index of the last playing
entry as this index was valid before the entry was removed.
This affects the insertion index.
Change-Id: Iec58d2df6bcbd8f55925e9e0f9d48f698f7cf4e5
Ricardo Cervera [Wed, 30 Apr 2014 22:03:40 +0000 (22:03 +0000)]
am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
27515952f54a8c98eaec694ce74c3b9d9b152746':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Wed, 30 Apr 2014 21:59:19 +0000 (21:59 +0000)]
am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
docs: Added release notes for Android Studio 0.5.2
John Reck [Wed, 30 Apr 2014 21:48:09 +0000 (21:48 +0000)]
Merge "Use resize, not reserve"
Ricardo Cervera [Tue, 29 Apr 2014 00:52:55 +0000 (17:52 -0700)]
docs: Added release notes for Android Studio 0.5.2
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
Kristian Monsen [Wed, 30 Apr 2014 21:40:30 +0000 (21:40 +0000)]
Merge "Try to not start up chromium when not needed"
Elliott Hughes [Wed, 30 Apr 2014 21:35:45 +0000 (21:35 +0000)]
am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:33:06 +0000 (21:33 +0000)]
am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:29:52 +0000 (21:29 +0000)]
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
John Reck [Wed, 30 Apr 2014 21:19:56 +0000 (14:19 -0700)]
Use resize, not reserve
Reserve ensures the underlying buffer is the correct size, but
iterating across it is not necessarily valid. Use resize() instead
to ensure that the iterator access is valid
Change-Id: I35ff5f4416bb94cf4ce2c6acf72ffd17ab3e523a
Deepanshu Gupta [Wed, 30 Apr 2014 20:38:49 +0000 (20:38 +0000)]
am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c046c76739b210d912dae38bf945d60b8d69ab11':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:35:04 +0000 (20:35 +0000)]
am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c0c96012c667d1d91d8f6b763df45e566cae0eaf':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:31:35 +0000 (20:31 +0000)]
am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 19:46:07 +0000 (19:46 +0000)]
am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
Make touch slop region smaller for watch
Mindy Pereira [Wed, 30 Apr 2014 19:43:58 +0000 (19:43 +0000)]
Merge "Make touch slop region smaller for watch" into klp-modular-dev
Michael Wright [Wed, 30 Apr 2014 19:11:05 +0000 (19:11 +0000)]
am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
809c369892ddbae908dc47e6a1032a768e9004cb':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Elliott Hughes [Wed, 30 Apr 2014 19:07:01 +0000 (19:07 +0000)]
am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
Fix for native leaks in YuvToJpegEncoder.cpp
Michael Wright [Wed, 30 Apr 2014 19:06:40 +0000 (19:06 +0000)]
am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Michael Wright [Wed, 30 Apr 2014 19:02:56 +0000 (19:02 +0000)]
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
Elliott Hughes [Wed, 30 Apr 2014 19:02:53 +0000 (19:02 +0000)]
am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
Elliott Hughes [Wed, 30 Apr 2014 18:59:54 +0000 (18:59 +0000)]
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
Igor Viarheichyk [Wed, 30 Apr 2014 18:56:42 +0000 (11:56 -0700)]
Fixes issue causing pseudolocalization of strings
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
Mindy Pereira [Wed, 30 Apr 2014 18:36:59 +0000 (11:36 -0700)]
Make touch slop region smaller for watch
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
destradaa [Wed, 30 Apr 2014 18:29:11 +0000 (11:29 -0700)]
Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it.
b/
14117917
Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
Nicolas Prevot [Mon, 24 Mar 2014 13:44:38 +0000 (13:44 +0000)]
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
Adrian Roos [Wed, 30 Apr 2014 17:41:24 +0000 (17:41 +0000)]
Merge "Fix broken trust agent reloading v2"
Kenny Guy [Wed, 30 Apr 2014 17:38:10 +0000 (17:38 +0000)]
Merge "Extend LauncherApps service to expose enabled state."
Narayan Kamath [Wed, 30 Apr 2014 17:36:14 +0000 (17:36 +0000)]
am
21ccb07f: am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
21ccb07fbe97097b6540097d89dd456447779178':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 17:36:10 +0000 (17:36 +0000)]
am
516130cc: am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
516130ccb1841afb6ef154c28269d91594925429':
Freeing frame map
Bill Yi [Wed, 30 Apr 2014 17:34:28 +0000 (17:34 +0000)]
Michael Wright [Wed, 30 Apr 2014 17:34:19 +0000 (17:34 +0000)]
am
1e67bcec: am
263c36a1: am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
1e67bcec505b1bfb67a83cb3d64e20c2bacf8581':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 17:33:23 +0000 (17:33 +0000)]
am
bba434af: am
10884694: am
357c75e7: Merge "Add missing character combinations for international layouts"
* commit '
bba434af67600b1fb4a32f2c130526ad9e938f86':
Add missing character combinations for international layouts
Selim Cinek [Wed, 30 Apr 2014 17:23:21 +0000 (17:23 +0000)]
Merge "Fixed a crash of the notification animation on initial startup"
Selim Cinek [Wed, 30 Apr 2014 16:57:47 +0000 (18:57 +0200)]
Fixed a crash of the notification animation on initial startup
When no state was applied yet and an animation was started the system
could crash.
Bug:
14430331
Change-Id: Ic8a4532b73f4d70cb365975f055d6630f61e0318
Dianne Hackborn [Wed, 30 Apr 2014 16:39:15 +0000 (16:39 +0000)]
Merge "Switch IProcessObserver to report process state"
Kenny Root [Wed, 30 Apr 2014 16:31:44 +0000 (09:31 -0700)]
resolved conflicts for merge of
3e320a0c to master
Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4
Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
Adrian Roos [Wed, 30 Apr 2014 16:23:38 +0000 (18:23 +0200)]
Fix broken trust agent reloading v2
Bug:
13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
Narayan Kamath [Wed, 30 Apr 2014 15:59:07 +0000 (15:59 +0000)]
Merge "Fix x86 build in app_process."
Adrian Roos [Wed, 30 Apr 2014 15:51:47 +0000 (15:51 +0000)]
Merge "Fix broken trust agent reloading"
Adrian Roos [Wed, 30 Apr 2014 15:48:18 +0000 (17:48 +0200)]
Fix broken trust agent reloading
Bug:
13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
Narayan Kamath [Wed, 30 Apr 2014 15:45:07 +0000 (16:45 +0100)]
Fix x86 build in app_process.
Look for __i386__ and not __x86__.
Change-Id: Iffa3709f9d0c96cce17f3183a6f036a78eccc787
Narayan Kamath [Wed, 30 Apr 2014 15:37:58 +0000 (15:37 +0000)]
am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
414d94059f3559b67b4da25a34de6d5312abe06f':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:37:44 +0000 (15:37 +0000)]
am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
dbbf431b289bb7a01b43db3412ecab00abe18362':
Freeing frame map
Narayan Kamath [Wed, 30 Apr 2014 15:13:02 +0000 (15:13 +0000)]
am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:12:58 +0000 (15:12 +0000)]
am
d0f7f418: Merge "Freeing frame map"
* commit '
d0f7f41828493b0679e908f7bb3ed3b8e838c463':
Freeing frame map
George Mount [Wed, 30 Apr 2014 14:27:31 +0000 (14:27 +0000)]
Merge "Fix NPE when going "back" from Activity Transition."
Jorim Jaggi [Wed, 30 Apr 2014 13:53:02 +0000 (13:53 +0000)]
Merge "NotificationRowLayout shall rest in its grave."
Jorim Jaggi [Wed, 30 Apr 2014 13:38:16 +0000 (15:38 +0200)]
NotificationRowLayout shall rest in its grave.
Long live the stack scroller. Also removed some other unused classes.
Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f