Victoria Lease
3efe709991
am df5ba9bf: am d19e7af0: am 5eb3e07c: Merge "add accessibility string for location quicksetting" into klp-dev
...
* commit 'df5ba9bfeb8e77522fbea7cb60bd0d9da8fb5276':
add accessibility string for location quicksetting
2013-10-23 11:18:32 -07:00
Victoria Lease
df5ba9bfeb
am d19e7af0: am 5eb3e07c: Merge "add accessibility string for location quicksetting" into klp-dev
...
* commit 'd19e7af02ab2d3d21921e5a313c78285b308ad9c':
add accessibility string for location quicksetting
2013-10-23 11:12:57 -07:00
Victoria Lease
d19e7af02a
am 5eb3e07c: Merge "add accessibility string for location quicksetting" into klp-dev
...
* commit '5eb3e07c5d8647f2bc250d37feb0c905621b2f90':
add accessibility string for location quicksetting
2013-10-23 11:11:04 -07:00
Victoria Lease
5eb3e07c5d
Merge "add accessibility string for location quicksetting" into klp-dev
2013-10-23 17:56:54 +00:00
Dianne Hackborn
7c6d71f352
am 15009a08: am adfb4dee: am 910c2857: Merge "Fix issue #11278906 : Some wm commands fail on shell users" into klp-dev
...
* commit '15009a080b4346c598dae12d9af840aba6a353da':
Fix issue #11278906 : Some wm commands fail on shell users
2013-10-23 10:53:00 -07:00
Dianne Hackborn
f4bcc592bf
am b3332447: am e6a8ccb3: am 2d76a1a0: Merge "Fix issue #11323037 : Android apk incorrectly marked as running in app processes" into klp-dev
...
* commit 'b3332447964dfe19299f6ba0365ee706daa4494b':
Fix issue #11323037 : Android apk incorrectly marked as running in app processes
2013-10-23 10:52:56 -07:00
Dianne Hackborn
15009a080b
am adfb4dee: am 910c2857: Merge "Fix issue #11278906 : Some wm commands fail on shell users" into klp-dev
...
* commit 'adfb4dee746dafc5cc2f2d1b8bcf0dc62cf82b24':
Fix issue #11278906 : Some wm commands fail on shell users
2013-10-23 10:49:55 -07:00
Dianne Hackborn
b333244796
am e6a8ccb3: am 2d76a1a0: Merge "Fix issue #11323037 : Android apk incorrectly marked as running in app processes" into klp-dev
...
* commit 'e6a8ccb3d11a3af2a2d9f0077965d05754abcff3':
Fix issue #11323037 : Android apk incorrectly marked as running in app processes
2013-10-23 10:49:52 -07:00
Dianne Hackborn
adfb4dee74
am 910c2857: Merge "Fix issue #11278906 : Some wm commands fail on shell users" into klp-dev
...
* commit '910c2857937b33391e02558c4b396aefa489f213':
Fix issue #11278906 : Some wm commands fail on shell users
2013-10-23 10:47:02 -07:00
Dianne Hackborn
e6a8ccb3d1
am 2d76a1a0: Merge "Fix issue #11323037 : Android apk incorrectly marked as running in app processes" into klp-dev
...
* commit '2d76a1a068839ac677e909ba8555fe812eaea841':
Fix issue #11323037 : Android apk incorrectly marked as running in app processes
2013-10-23 10:46:58 -07:00
Dianne Hackborn
910c285793
Merge "Fix issue #11278906 : Some wm commands fail on shell users" into klp-dev
2013-10-23 17:44:21 +00:00
Dianne Hackborn
2d76a1a068
Merge "Fix issue #11323037 : Android apk incorrectly marked as running in app processes" into klp-dev
2013-10-23 17:44:11 +00:00
Narayan Kamath
0b3bcedccc
Merge "Get rid of coretests/android.text.HtmlTest"
2013-10-23 17:35:49 +00:00
John Spurlock
e27564fbae
am 759bc4f4: am 7539a5af: am 2f566900: Merge "Ensure the simple CAB appears below the status bar." into klp-dev
...
* commit '759bc4f421e01460cff92522bf70d52c53b79e85':
Ensure the simple CAB appears below the status bar.
Add 'no system permission' test app.
2013-10-23 10:24:23 -07:00
Dianne Hackborn
0cca3db9ad
Fix issue #11278906 : Some wm commands fail on shell users
...
Binder.clearCallingIdentity makes everything better.
Change-Id: I31cd9478c857553b3cf1ea54d5b4987571788796
2013-10-23 10:23:39 -07:00
John Spurlock
759bc4f421
am 7539a5af: am 2f566900: Merge "Ensure the simple CAB appears below the status bar." into klp-dev
...
* commit '7539a5afa73e9d7bc77803295368542ef535f28c':
Ensure the simple CAB appears below the status bar.
Add 'no system permission' test app.
2013-10-23 10:20:09 -07:00
John Spurlock
7539a5afa7
am 2f566900: Merge "Ensure the simple CAB appears below the status bar." into klp-dev
...
* commit '2f566900a4fdeab75c972259a97dfb40b96df421':
Ensure the simple CAB appears below the status bar.
Add 'no system permission' test app.
2013-10-23 10:17:13 -07:00
John Spurlock
2f566900a4
Merge "Ensure the simple CAB appears below the status bar." into klp-dev
2013-10-23 15:48:22 +00:00
Narayan Kamath
515662fa6f
Get rid of coretests/android.text.HtmlTest
...
This is a strict subset of android.text.cts.HtmlTest and
is currently completely broken (due to ltr changes).
Change-Id: If8d5c8a03f96ef3712cd398f297c8872d91403bb
2013-10-23 15:36:18 +01:00
Dianne Hackborn
237cefbcee
Fix issue #11323037 : Android apk incorrectly marked as running in app processes
...
The android package is now a special case, not being added to the package list
when creating a multi-process component. There is no need, since this package
is actually the framework itself which must be loaded in every process.
Also cleaned up some of the procstats dump output to help see what is going
on here.
Change-Id: If65d35ecd562f3154bdebfded69c454af6ce8c96
2013-10-22 19:15:49 -07:00
Brett Chabot
89bd973344
Merge "Add 'no system permission' test app." into klp-dev
2013-10-23 01:17:34 +00:00
Todd Poynor
0edc5b50ab
BatteryService: use new batteryproperties service name
...
Change-Id: Ib065a1099ec17d799f9caa6bb48390b478c28ed7
2013-10-22 17:53:13 -07:00
Todd Poynor
50ae385894
BatteryService: remove dumpsys-only info duplicated by systemhealth
...
Change-Id: I7fa605304b5f62ea19bcf3851d11abe7bf6c83f5
2013-10-23 00:15:08 +00:00
Christopher Tate
4c795f6990
am 037fa248: am d34e1155: am 5f474fcb: Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
...
* commit '037fa2489ff4d8646e4df67950fc93a80345d879':
Edge case: overriden system package moved & became privileged in OTA
2013-10-22 16:50:35 -07:00
Christopher Tate
037fa2489f
am d34e1155: am 5f474fcb: Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
...
* commit 'd34e1155226e8885d51c05209c7c87503528a2db':
Edge case: overriden system package moved & became privileged in OTA
2013-10-22 16:45:51 -07:00
Christopher Tate
d34e115522
am 5f474fcb: Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
...
* commit '5f474fcb6d6a0215f7726580921e0610ca6281a1':
Edge case: overriden system package moved & became privileged in OTA
2013-10-22 16:42:39 -07:00
Christopher Tate
5f474fcb6d
Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
2013-10-22 23:38:02 +00:00
Christopher Tate
9f08820025
Edge case: overriden system package moved & became privileged in OTA
...
Because properly continuing permission grants post-OTA has changed
policy to include privilege considerations based on install location,
make sure that we re-evaluate when we determine that the apk has
moved from its pre-OTA location.
Bug 11271490
Change-Id: I6c09986e2851a67504268b289932588457c05dfc
2013-10-22 15:36:01 -07:00
Craig Mautner
94fb73beaa
am 004aa071: am deba7bb0: am 798adeff: Don\'t use transient states for wallpaper animation.
...
* commit '004aa0714a1dbad33ee11c210edf7371e424b26b':
Don't use transient states for wallpaper animation.
2013-10-22 15:02:00 -07:00
Craig Mautner
004aa0714a
am deba7bb0: am 798adeff: Don\'t use transient states for wallpaper animation.
...
* commit 'deba7bb0ca821d219a384c3d611e8a25da32e07d':
Don't use transient states for wallpaper animation.
2013-10-22 14:59:38 -07:00
Craig Mautner
deba7bb0ca
am 798adeff: Don\'t use transient states for wallpaper animation.
...
* commit '798adeffb0b9c22707b493895453e7dd2f608b75':
Don't use transient states for wallpaper animation.
2013-10-22 14:58:12 -07:00
Craig Mautner
798adeffb0
Don't use transient states for wallpaper animation.
...
The WindowManagerService member mLowerWallpaperTarget is not stable
throughout an app transition. Relying on it to be stable causes the
intra-wallpaper animation to start out right but after the windows
have been relayed out there is no longer a lower wallpaper target.
This causes the wallpaper to start tracking the animation of the
current wallpaper target rather than remain stable.
Switching to a new variable that saves the state of wallpaper
animation at the start of the animation fixes bug 11240590.
Change-Id: I336a59c47665fcf61019f567b8663956ff0e4940
2013-10-22 14:50:52 -07:00
Costin Manolache
ec1bd6e5b2
Merge "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
2013-10-22 20:24:26 +00:00
Craig Mautner
dd2399a0d9
am 74897f07: am d37d1859: am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit '74897f07491078e14282b30174cf14c9815d8dc0':
Check for home activity when switching focus.
2013-10-22 13:09:22 -07:00
Craig Mautner
74897f0749
am d37d1859: am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit 'd37d1859794e72ea6f9b98f83bf004a4364b4b2d':
Check for home activity when switching focus.
2013-10-22 13:07:00 -07:00
Craig Mautner
d37d185979
am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit '40006309990c40f5b4b26646b98df222d8d27922':
Check for home activity when switching focus.
2013-10-22 13:04:07 -07:00
Craig Mautner
4000630999
Merge "Check for home activity when switching focus." into klp-dev
2013-10-22 20:01:12 +00:00
Baligh Uddin
52c2365cb7
am 9dd9445a: (-s ours) am b1c3072c: (-s ours) am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9dd9445a365f77e1b45af39218e31df764238f32':
Import translations. DO NOT MERGE
2013-10-22 12:57:14 -07:00
Baligh Uddin
ea4ad2dba8
am f04e6695: (-s ours) am 501633dd: (-s ours) am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f04e66953b8d6f694b4cc2e80cb8cc0212d31443':
Import translations. DO NOT MERGE
2013-10-22 12:57:09 -07:00
Baligh Uddin
9dd9445a36
am b1c3072c: (-s ours) am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'b1c3072ca3cf6835b43d2e7152b284d00bdcdadf':
Import translations. DO NOT MERGE
2013-10-22 12:55:18 -07:00
Baligh Uddin
f04e66953b
am 501633dd: (-s ours) am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '501633dd45858159255447f7b4118a80b44bbcae':
Import translations. DO NOT MERGE
2013-10-22 12:55:15 -07:00
Baligh Uddin
b1c3072ca3
am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'd94b7ffc2e621a48bed9f10fa03dcc7508fce8ce':
Import translations. DO NOT MERGE
2013-10-22 12:52:23 -07:00
Baligh Uddin
501633dd45
am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f56d8694f224ef7082c48a227d18d5612a4cfe11':
Import translations. DO NOT MERGE
2013-10-22 12:52:16 -07:00
Baligh Uddin
530bdf0814
Merge "Import translations. DO NOT MERGE"
2013-10-22 19:48:17 +00:00
Baligh Uddin
d94b7ffc2e
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-22 19:48:12 +00:00
Baligh Uddin
d271d054a9
Merge "Import translations. DO NOT MERGE"
2013-10-22 19:48:09 +00:00
Baligh Uddin
f56d8694f2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-22 19:48:05 +00:00
Craig Mautner
04f0b70c13
Check for home activity when switching focus.
...
When finishing or stopping an activity the code was automatically
refocusing to the next activity on the same stack independent of the
task's onTopOfHome flag. When the activity eventually finished or
stopped it would then honor the onTopOfHome flag.
This fix examines the onTopOfHome flag and arranges the focus
correctly if home is the next activity to run.
Fixes bug 11318263.
Change-Id: I73a8f5e82de04b01acaffe366b085f9e475e1451
2013-10-22 12:31:01 -07:00
John Spurlock
a81736a74d
Ensure the simple CAB appears below the status bar.
...
When the contextual action bar is not in overlay mode,
the screen layout is a linear layout. (screen_simple.xml)
Ensure the standalone CAB appears below the status bar,
consumes the top offset (to avoid content application below it)
and fill in the status area with a guard view for background
protection.
Bug:10014069
Change-Id: I614f16dfa77367a94808aef54710ffebd66e1ca8
2013-10-22 13:51:52 -04:00
Craig Mautner
d8796d44d5
am 39308006: am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
...
* commit '39308006d6868fa7be892276e31ff90943f8d99b':
Make sure mFocusedStack is never the home stack.
2013-10-22 10:45:02 -07:00