OSDN Git Service
Roshan Pius [Sat, 3 Dec 2016 04:18:00 +0000 (04:18 +0000)]
Merge changes from topic 'fast-bss-transition'
am:
f301986727
Change-Id: I0b0334f193120d379031d9790d68bc2840254391
Paul Stewart [Sat, 3 Dec 2016 04:17:49 +0000 (04:17 +0000)]
Add capability flag for 802.11r fast BSS transition
am:
07f4d23a88
Change-Id: Ife9a8e1342b6b090dec749cf505fd3091ff33f89
Paul Stewart [Sat, 3 Dec 2016 04:16:58 +0000 (04:16 +0000)]
Add constants for 802.11r
am:
e72f7dc385
Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
Stephen Chen [Sat, 3 Dec 2016 04:16:06 +0000 (04:16 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am:
d758ce1586
Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
Colin Cross [Sat, 3 Dec 2016 04:14:58 +0000 (04:14 +0000)]
Merge "Convert libandroidfw to Android.bp"
am:
46ec8dba83
Change-Id: I32a737c491eeb95ad080adacd47602ee814ba0cb
Roshan Pius [Fri, 2 Dec 2016 23:57:39 +0000 (23:57 +0000)]
Merge changes from topic 'fast-bss-transition'
* changes:
Add capability flag for 802.11r fast BSS transition
Add constants for 802.11r
Treehugger Robot [Fri, 2 Dec 2016 23:41:36 +0000 (23:41 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
Treehugger Robot [Fri, 2 Dec 2016 23:16:48 +0000 (23:16 +0000)]
Merge "Convert libandroidfw to Android.bp"
Chris Tate [Fri, 2 Dec 2016 22:45:47 +0000 (22:45 +0000)]
Merge "Fix the deadlock problem"
am:
fa228e06f6
Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
Chris Tate [Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)]
Merge "Fix the deadlock problem"
Jaekyun Seok [Fri, 2 Dec 2016 19:35:03 +0000 (19:35 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
am:
c60963e451
Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
Colin Cross [Thu, 1 Dec 2016 23:55:00 +0000 (15:55 -0800)]
Convert libandroidfw to Android.bp
See build/soong/README.md for more information.
Test: libandroidfw_tests
Merged-In: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
(cherry picked from commit
4f8d9e69eb63878a99abedfdc7b92c6284f30605)
Treehugger Robot [Fri, 2 Dec 2016 19:21:46 +0000 (19:21 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
Robert Sesek [Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am:
eda1af611f
Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
Treehugger Robot [Fri, 2 Dec 2016 17:02:31 +0000 (17:02 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
Jack He [Fri, 2 Dec 2016 04:49:39 +0000 (04:49 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am:
7dd909684f
Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
Treehugger Robot [Fri, 2 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
Mark Salyzyn [Fri, 2 Dec 2016 03:44:33 +0000 (03:44 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list"
am:
1981812450
Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa
Robert Greenwalt [Fri, 2 Dec 2016 03:39:30 +0000 (03:39 +0000)]
Merge "Get the correct operator name"
am:
297e9f9a32
Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
Jack He [Thu, 1 Dec 2016 00:28:53 +0000 (16:28 -0800)]
Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug:
33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
Treehugger Robot [Fri, 2 Dec 2016 00:39:55 +0000 (00:39 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list"
Robert Greenwalt [Thu, 1 Dec 2016 23:29:28 +0000 (23:29 +0000)]
Merge "Get the correct operator name"
Zoran Jovanovic [Wed, 2 Nov 2016 08:56:38 +0000 (09:56 +0100)]
Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.
Bug:
32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
ltrochtova [Thu, 1 Dec 2016 21:48:07 +0000 (21:48 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am:
4eb075e89f -s ours
Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158
Michael Rosenfeld [Thu, 1 Dec 2016 21:40:06 +0000 (21:40 +0000)]
Merge "Add command line action sequencing."
am:
880c9acf4a
Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
Etan Cohen [Thu, 1 Dec 2016 21:35:05 +0000 (21:35 +0000)]
Merge "AWARE: Abstract structure of match filters"
am:
f358a69cba
Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
ltrochtova [Thu, 1 Dec 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am:
1e9a5eac92 -s ours
Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
ltrochtova [Thu, 1 Dec 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 20:50:53 +0000 (20:50 +0000)]
Revert "Introduce a new user restriction for disallowing Bluetooth."
This reverts commit
69f9d321ac19e7137e07b411779339f9973eba1b.
Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
Treehugger Robot [Thu, 1 Dec 2016 17:23:37 +0000 (17:23 +0000)]
Merge "Add command line action sequencing."
Etan Cohen [Thu, 1 Dec 2016 15:42:34 +0000 (15:42 +0000)]
Merge "AWARE: Abstract structure of match filters"
ltrochtova [Thu, 1 Dec 2016 13:40:28 +0000 (13:40 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
Lenka Trochtova [Thu, 24 Nov 2016 15:48:37 +0000 (16:48 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
Stephen Chen [Thu, 1 Dec 2016 03:23:32 +0000 (03:23 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
am:
f9479fe639
Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
Treehugger Robot [Thu, 1 Dec 2016 03:08:44 +0000 (03:08 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
Andreas Gampe [Thu, 1 Dec 2016 02:48:18 +0000 (02:48 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
am:
de32925ccd
Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
Stephen Chen [Wed, 16 Nov 2016 23:46:51 +0000 (15:46 -0800)]
Add Settings.Global.WIFI_WAKEUP_ENABLED flag.
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#
Bug:
32920000
Bug:
32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
Amin Shaikh [Thu, 1 Dec 2016 02:10:55 +0000 (02:10 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am:
3af97482f1
Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
pengzhicai [Tue, 29 Nov 2016 11:01:44 +0000 (19:01 +0800)]
Fix the deadlock problem
https://code.google.com/p/android/issues/detail?id=229020
Change-Id: Ib08f62dd916d09e666e58fb583555170d1e51da6
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Jaekyun Seok [Wed, 23 Nov 2016 07:28:34 +0000 (16:28 +0900)]
Remove static link in Android framework under /frameworks/base.
The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.
Size diffs of libs in /system/lib on angler-userdebug build are as
following.
libandroidfw.so : 243748 -> 205196 (-38552)
libhwui.so : 562028 -> 562580 (+552)
libmedia_jni.so : 293652 -> 293656 (+4)
(All the others have the same size.)
total: (-37996)
Test: building succeeded, and the image was tested on angler.
Bug:
33056637
Change-Id: I3021fb438778eaea2be935b990ec85c4aec6c008
(cherry picked from commit
2b14c5eaf61635d1c3a69a2e59faa23cb6b7f7cb)
Etan Cohen [Wed, 23 Nov 2016 19:11:23 +0000 (11:11 -0800)]
AWARE: Abstract structure of match filters
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.
Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.
Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.
(cherry-pick of commit
c9870d0d431471bf1362e46fc4f2f1bc6722896a)
Bug:
32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
Andreas Gampe [Thu, 1 Dec 2016 00:35:32 +0000 (16:35 -0800)]
App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.
Bug:
33224213
Test: mmma frameworks/base/cmds/app_process && \
mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
frameworks/base/cmds/app_process && \
ls $OUT/system/bin/asanwrapper && \
readelf -s $OUT/system/bin/app_process32 | grep asan && \
readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \
Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
Andreas Gampe [Thu, 1 Dec 2016 00:09:00 +0000 (00:09 +0000)]
Merge "App_process: Clean up sanitized binaries"
am:
273adb5257
Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
Glenn Kasten [Thu, 1 Dec 2016 00:06:49 +0000 (00:06 +0000)]
Merge "LOCAL_CLANG := true is now the default"
am:
1204e3806f
Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
Stephen Chen [Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)]
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
am:
6e54c31f0a
Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
Robert Greenwalt [Thu, 1 Dec 2016 00:01:04 +0000 (00:01 +0000)]
Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am:
fbb48bcecd
Change-Id: I7a1c9a20e5f4f9f051926294650fcf9d486d4703
nharold [Thu, 1 Dec 2016 00:00:09 +0000 (00:00 +0000)]
Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am:
4134ccb214
Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
Jordan Liu [Wed, 30 Nov 2016 18:04:11 +0000 (10:04 -0800)]
resolve merge conflicts of
a578ae2 to stage-aosp-master
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
Amin Shaikh [Tue, 22 Nov 2016 01:27:53 +0000 (17:27 -0800)]
Refactor NetworkScoreAppManager for testing.
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
Treehugger Robot [Wed, 30 Nov 2016 21:00:55 +0000 (21:00 +0000)]
Merge "App_process: Clean up sanitized binaries"
Treehugger Robot [Wed, 30 Nov 2016 20:35:37 +0000 (20:35 +0000)]
Merge "LOCAL_CLANG := true is now the default"
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
Robert Greenwalt [Wed, 30 Nov 2016 19:47:22 +0000 (19:47 +0000)]
Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
Michael Rosenfeld [Tue, 29 Nov 2016 02:08:00 +0000 (18:08 -0800)]
Add command line action sequencing.
Supported actions:
* .. scan <process> ..
* .. scan-all ..
* .. import <infile> ..
* .. export <infile> ..
* .. comp <thresh> <outfile> ..
Test: manual
Bug:
31961946
Change-Id: I08753f31294ac5f30f6bcddeabef12d138e7e8e6
Stephen Chen [Mon, 28 Nov 2016 19:40:58 +0000 (11:40 -0800)]
Add meteredOverride field to WifiConfiguration.
This stores a user's metered selection. This will be set by
Settings -> Data Usage -> Network restrictions and used in conjunction
with WifiConfiguration.meteredHint to properly track a Wifi network's
metered state.
Bug:
33106464
Bug:
26545374
Test: runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java
runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
Change-Id: I1a378ef2946c1b5b6091bba379f2ab48a15d29d8
nharold [Wed, 30 Nov 2016 18:00:34 +0000 (18:00 +0000)]
Merge "Expose GSM Timing Advance, Update LTE TA docstring"
Andreas Gampe [Wed, 30 Nov 2016 03:28:13 +0000 (19:28 -0800)]
App_process: Clean up sanitized binaries
Clean up the definition of sanitized binaries. Clean up the
Android.mk to share values.
Bug:
33224213
Test: mmma SANITIZE_TARGET=address SANITIZE_LITE=true frameworks/base/cmds/app_process && ls $OUT/system/bin/asan
Change-Id: I70f8d95ff2ec6366fc0a7d252b91dce268186910
Jordan Liu [Wed, 30 Nov 2016 17:42:30 +0000 (17:42 +0000)]
Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY"
Glenn Kasten [Mon, 15 Aug 2016 23:10:24 +0000 (16:10 -0700)]
LOCAL_CLANG := true is now the default
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit
3a7510bcf6089d3ef768de7cf805ca783f0aac17)
Etan Cohen [Wed, 30 Nov 2016 17:08:32 +0000 (17:08 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
am:
47502919ad
Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26
Etan Cohen [Wed, 30 Nov 2016 16:58:07 +0000 (16:58 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
Etan Cohen [Wed, 16 Nov 2016 15:07:11 +0000 (07:07 -0800)]
[AWARE] Data-path creation roles hard-coded for discovery sessions
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.
(cherry-pick of commit
9c7483fec41db681a2d6de93a9061fb8764ecba5)
Bug:
32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
Paul Duffin [Wed, 30 Nov 2016 12:15:14 +0000 (12:15 +0000)]
Merge "Add legacy-test as replacement for core-junit"
am:
e75a82a92f
Change-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6
Paul Duffin [Wed, 30 Nov 2016 12:04:23 +0000 (12:04 +0000)]
Merge "Add legacy-test as replacement for core-junit"
Mark Lu [Wed, 30 Nov 2016 09:14:31 +0000 (09:14 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue."
am:
32e756a4bc
Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17
Treehugger Robot [Wed, 30 Nov 2016 07:59:54 +0000 (07:59 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue."
Andreas Gampe [Wed, 30 Nov 2016 00:49:44 +0000 (00:49 +0000)]
Merge "Preload2: Add sequence UI"
am:
56ddac7fd7
Change-Id: I6ca6e1ea6c6721a24f7b1d3d7fb4715bd51aa0d9
Treehugger Robot [Wed, 30 Nov 2016 00:39:18 +0000 (00:39 +0000)]
Merge "Preload2: Add sequence UI"
Andreas Gampe [Mon, 28 Nov 2016 23:07:39 +0000 (15:07 -0800)]
Preload2: Add sequence UI
Add a fake UI that can run a sequence of actions (and replies).
Bug:
31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de
Robert Sesek [Fri, 4 Nov 2016 14:20:38 +0000 (10:20 -0400)]
Add new hostingType for startProcessLocked() that selects using the WebViewZygote.
Test: m
Test: angler boots
Test: Turn on Multiprocess WebView in Developer Options and launch the WebView
Shell. The sandboxed_service parent process is the webview_zygote.
Bug:
21643067
Change-Id: I9dab548853372fd91f6bbe204cc8686ef2e94448
Paul Duffin [Tue, 29 Nov 2016 15:12:46 +0000 (15:12 +0000)]
Merge "Use junit-host instead of junit"
am:
6063357ae6
Change-Id: I6522cedeb522fa01530d4f31b6505b4d4c265312
Paul Duffin [Mon, 28 Nov 2016 15:51:09 +0000 (15:51 +0000)]
Add legacy-test as replacement for core-junit
Statically includes core-junit-static into legacy-test target so
that legacy-test can be used in place of core-test. Once that
switch over has been done then android.test classes that are
being removed from the public API can be safely moved into here.
Bug:
30188076
Test: make legacy-test and check contents of generated legacy-test artifacts
Change-Id: I75488303067c4ac34c46279bfce9a51273adcc34
Paul Duffin [Tue, 29 Nov 2016 15:01:31 +0000 (15:01 +0000)]
Merge "Use junit-host instead of junit"
Paul Duffin [Tue, 29 Nov 2016 13:00:19 +0000 (13:00 +0000)]
Use junit-host instead of junit
Bug:
30188076
Test: make checkbuild
Change-Id: I3496b9d7e40abf7712a56ba633a2becd0aa17c06
Mark Lu [Tue, 29 Nov 2016 14:34:28 +0000 (14:34 +0000)]
Merge "[AM] Fix system server may killed when monkey crash."
am:
21ed56daac
Change-Id: I0a556d253099eab172ac297cb3e799b9095ef853
Treehugger Robot [Tue, 29 Nov 2016 14:23:03 +0000 (14:23 +0000)]
Merge "[AM] Fix system server may killed when monkey crash."
Paul Duffin [Tue, 29 Nov 2016 10:22:34 +0000 (10:22 +0000)]
Merge "Use junit-host instead of junit"
am:
7dda7e1e81
Change-Id: Ie070bf5329899f21e3fb65dae6db5fdd50e74ba9
Paul Duffin [Tue, 29 Nov 2016 10:12:51 +0000 (10:12 +0000)]
Merge "Use junit-host instead of junit"
Mark Lu [Mon, 21 Nov 2016 07:38:13 +0000 (15:38 +0800)]
[AM] Fix system server may killed when monkey crash.
Symptom: monkey crash caused system server killed.
Root Cause: when monkey crash or app crash before process bound,
calling AppErrors.crashApplication will first
clear binder identities, that will caused calling pid / uid
will become with current process (i.e. system server),
so in handleAppCrashInActivityController, when monkey registered
activityController would like to kill crash process,
but not found in AMS (monkey created by app_process)
then using calling pid / uid will become to kill system server.
Solution: add calling pid / uid parameters for
handleAppCrashInActivityController to prevent binder identities
cleared case.
Test: To simulate monkey or app crash before process bound may not easy
by using simple command, but we can write a sample program to
simulate RuntimeInit to call handleApplicationCrash when met
uncauchtException,
Below is test steps in Android 7.1.1 emulator.
1. start emulator
2. after emulater started, use "adb shell am monitor" to set
activityController & monitor process by console.
3. write a .jar program as monkey by below sample code to simulate null
application binder to call handleApplicationCrash() as RuntimeInit:
package com.android.test;
import com.android.internal.os.BaseCommand;
public class SimulateMonkeyCrash extends BaseCommand {
public static void main(String[] args) {
IActivityManager am = ActivityManagerNative.getDefault();
try {
am.handleApplicationCrash(null,
new ApplicationErrorReport.CrashInfo(new Throwable()));
} catch (RemoteException e) {
e.printStackTrace();
}
}
4. write a .sh file named SimulateMonkeyCrash.sh as below:
#
base=/system
export CLASSPATH=$base/framework/SimulateMonkeyCrash.jar
exec app_process $base/bin com.android.test.SimulateMonkeyCrash "$@"
5. let .sh file is executable by "chomod 755".
6. push .jar file into /system/framework & .sh file into /system/bin
7 execute .sh file.
8. activityController will detected program crash in console as below,
press k:
Waiting after crash... available commands:
(c)ontinue: show crash dialog
(k)ill: immediately kill app
(q)uit: finish monitoring
9 you can see system server is crash.
Change-Id: Ibac4d88872f24af109d8e8522ecf5ac72fac0ce0
Andreas Gampe [Tue, 29 Nov 2016 03:20:57 +0000 (03:20 +0000)]
Merge changes I37c8daa6,I5a05b65d,If56347fd
am:
9309f1cbf3
Change-Id: I847aeea3e025d07eb809310dc7dc5ea3ef0fc285
Andreas Gampe [Tue, 29 Nov 2016 03:20:51 +0000 (03:20 +0000)]
Preload2: Add isSingleThreaded
am:
3bf65c916c
Change-Id: I6bf6c5b934cb89937bb329ea7b9f50c70b3a898d
Andreas Gampe [Tue, 29 Nov 2016 03:20:12 +0000 (03:20 +0000)]
Preload2: Fix action inheritance
am:
1c809a3d32
Change-Id: I8ef23a6ee16b1462d65ef2d7a3f62e9d586c92ff
Andreas Gampe [Tue, 29 Nov 2016 03:19:34 +0000 (03:19 +0000)]
Preload2: Abstract out UI
am:
5cb8998363
Change-Id: Ia4a147e061397951ada72beac7c5781b8dbac918
Treehugger Robot [Tue, 29 Nov 2016 03:08:20 +0000 (03:08 +0000)]
Merge changes I37c8daa6,I5a05b65d,If56347fd
* changes:
Preload2: Add isSingleThreaded
Preload2: Fix action inheritance
Preload2: Abstract out UI
Stephen Chen [Mon, 14 Nov 2016 23:59:33 +0000 (15:59 -0800)]
Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings.
Exposes an activity that deep links into saved network Settings.
Bug:
32738882
Test: gts test
Change-Id: Ic639b7543439bbe52941fa58a74a767a4a0f8a76
Andreas Gampe [Mon, 28 Nov 2016 23:06:35 +0000 (15:06 -0800)]
Preload2: Add isSingleThreaded
Expose whether a UI is single-threaded to avoid spawning threads
in actions.
Bug:
31961946
Test: manual
Change-Id: I37c8daa6a00784e833bad53b8e83ab4417955df7
Andreas Gampe [Mon, 28 Nov 2016 23:04:25 +0000 (15:04 -0800)]
Preload2: Fix action inheritance
Use AbstractThreadedAction as a base.
Bug:
31961946
Test: manual
Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
Andreas Gampe [Mon, 28 Nov 2016 21:15:10 +0000 (13:15 -0800)]
Preload2: Abstract out UI
Create IUI interface and move UI to SwingUI.
Bug:
31961946
Test: manual
Change-Id: If56347fdde8b441c0c01337a3f5eac002ea5b4f3
Hall Liu [Mon, 28 Nov 2016 20:58:43 +0000 (20:58 +0000)]
Merge "Add removeState method to StateMachine"
am:
0310de1136
Change-Id: Ib7d8e435c76bc7bcd83d6350c3c0622bb44d6552
Hall Liu [Mon, 28 Nov 2016 20:52:01 +0000 (20:52 +0000)]
Merge "Add removeState method to StateMachine"
Paul Duffin [Mon, 28 Nov 2016 16:44:44 +0000 (16:44 +0000)]
Use junit-host instead of junit
Bug:
30188076
Test: make checkbuild
Change-Id: I5d3efbfbe3245a631113674bff1b0aabdc9fe8be
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:06 +0000 (13:25 +0000)]
Merge "Use the new refined DexOptNeeded codes."
am:
d7e597a2e7
Change-Id: I58fbb54b94350e633fdd38cfb984de87a1862fd2
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Use the new refined DexOptNeeded codes."
Nicolas Geoffray [Fri, 25 Nov 2016 09:50:29 +0000 (09:50 +0000)]
Use the new refined DexOptNeeded codes.
bug:
30937355
Test: device boots, messages are printed correctly
Change-Id: Ia5274e3659471c2a52244d5838d207d407e79023
Paul Duffin [Thu, 24 Nov 2016 11:57:48 +0000 (11:57 +0000)]
Merge "Move JUnit classes from here into external/junit"
am:
552744390f
Change-Id: I994dc5533d4f1dad35a161e998f57ecab56ab8a3
Paul Duffin [Thu, 24 Nov 2016 11:52:23 +0000 (11:52 +0000)]
Move JUnit classes from here into external/junit
am:
0342ab5b94
Change-Id: I9111fe5e643794452008cf2cad933da0ca15bd00
Paul Duffin [Thu, 24 Nov 2016 11:44:01 +0000 (11:44 +0000)]
Merge "Move JUnit classes from here into external/junit"
Etan Cohen [Wed, 23 Nov 2016 23:50:27 +0000 (23:50 +0000)]
Merge "[AWARE] Move manager tests from service to manager directory"
am:
018f6ec16f
Change-Id: I795e75882ac702c3637afa43ba2f73d612d74661