Commit Graph

277484 Commits

Author SHA1 Message Date
Jordan Liu
cee0c941ed resolve merge conflicts of a578ae2 to stage-aosp-master
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
2016-11-30 15:08:13 -08:00
Amin Shaikh
aa09aa0210 Refactor NetworkScoreAppManager for testing.
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
2016-11-30 13:52:43 -08:00
Treehugger Robot
273adb5257 Merge "App_process: Clean up sanitized binaries" 2016-11-30 21:00:56 +00:00
Treehugger Robot
1204e3806f Merge "LOCAL_CLANG := true is now the default" 2016-11-30 20:35:41 +00:00
Treehugger Robot
6e54c31f0a Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 2016-11-30 20:25:13 +00:00
Robert Greenwalt
fbb48bcecd Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" 2016-11-30 19:47:23 +00:00
Michael Rosenfeld
c37b0a40e7 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
2016-11-30 11:26:33 -08:00
Stephen Chen
c76fda7269 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
2016-11-30 11:15:13 -08:00
nharold
4134ccb214 Merge "Expose GSM Timing Advance, Update LTE TA docstring" 2016-11-30 18:00:35 +00:00
Andreas Gampe
622f511f2f 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
2016-11-30 09:46:09 -08:00
Jordan Liu
a578ae2aa1 Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY" 2016-11-30 17:42:31 +00:00
Glenn Kasten
827d0d76fb LOCAL_CLANG := true is now the default
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit 3a7510bcf6)
2016-11-30 09:42:23 -08:00
Etan Cohen
ad299d38ff Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
am: 47502919ad

Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26
2016-11-30 17:08:32 +00:00
Etan Cohen
47502919ad Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" 2016-11-30 16:58:08 +00:00
Etan Cohen
1ddf6a6d3a [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
2016-11-30 07:10:42 -08:00
Paul Duffin
a485fa1fce Merge "Add legacy-test as replacement for core-junit"
am: e75a82a92f

Change-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6
2016-11-30 12:15:14 +00:00
Paul Duffin
e75a82a92f Merge "Add legacy-test as replacement for core-junit" 2016-11-30 12:04:23 +00:00
Mark Lu
15df815e1e Merge "Fix batterySendBroadcast not synchronized issue."
am: 32e756a4bc

Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17
2016-11-30 09:14:31 +00:00
Treehugger Robot
32e756a4bc Merge "Fix batterySendBroadcast not synchronized issue." 2016-11-30 07:59:55 +00:00
Andreas Gampe
b9d8535a21 Merge "Preload2: Add sequence UI"
am: 56ddac7fd7

Change-Id: I6ca6e1ea6c6721a24f7b1d3d7fb4715bd51aa0d9
2016-11-30 00:49:44 +00:00
Treehugger Robot
56ddac7fd7 Merge "Preload2: Add sequence UI" 2016-11-30 00:39:19 +00:00
Andreas Gampe
437474990d Preload2: Add sequence UI
Add a fake UI that can run a sequence of actions (and replies).

Bug: 31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de
2016-11-29 15:22:02 -08:00
Robert Sesek
c5f86647b1 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
2016-11-29 11:08:49 -05:00
Paul Duffin
6fc0c5ceca Merge "Use junit-host instead of junit"
am: 6063357ae6

Change-Id: I6522cedeb522fa01530d4f31b6505b4d4c265312
2016-11-29 15:12:46 +00:00
Paul Duffin
e20f193a8c 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
2016-11-29 15:04:00 +00:00
Paul Duffin
6063357ae6 Merge "Use junit-host instead of junit" 2016-11-29 15:01:32 +00:00
Paul Duffin
4a064d2010 Use junit-host instead of junit
Bug: 30188076
Test: make checkbuild
Change-Id: I3496b9d7e40abf7712a56ba633a2becd0aa17c06
2016-11-29 14:52:42 +00:00
Mark Lu
ef4267e53a Merge "[AM] Fix system server may killed when monkey crash."
am: 21ed56daac

Change-Id: I0a556d253099eab172ac297cb3e799b9095ef853
2016-11-29 14:34:28 +00:00
Treehugger Robot
21ed56daac Merge "[AM] Fix system server may killed when monkey crash." 2016-11-29 14:23:03 +00:00
Paul Duffin
bbb501281e Merge "Use junit-host instead of junit"
am: 7dda7e1e81

Change-Id: Ie070bf5329899f21e3fb65dae6db5fdd50e74ba9
2016-11-29 10:22:34 +00:00
Paul Duffin
7dda7e1e81 Merge "Use junit-host instead of junit" 2016-11-29 10:12:52 +00:00
Mark Lu
b5e2499631 [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
2016-11-29 06:21:24 +00:00
Andreas Gampe
b4248148da Merge changes I37c8daa6,I5a05b65d,If56347fd
am: 9309f1cbf3

Change-Id: I847aeea3e025d07eb809310dc7dc5ea3ef0fc285
2016-11-29 03:20:57 +00:00
Andreas Gampe
57c14c8ee6 Preload2: Add isSingleThreaded
am: 3bf65c916c

Change-Id: I6bf6c5b934cb89937bb329ea7b9f50c70b3a898d
2016-11-29 03:20:51 +00:00
Andreas Gampe
24cd3418c7 Preload2: Fix action inheritance
am: 1c809a3d32

Change-Id: I8ef23a6ee16b1462d65ef2d7a3f62e9d586c92ff
2016-11-29 03:20:12 +00:00
Andreas Gampe
826ec71e96 Preload2: Abstract out UI
am: 5cb8998363

Change-Id: Ia4a147e061397951ada72beac7c5781b8dbac918
2016-11-29 03:19:34 +00:00
Treehugger Robot
9309f1cbf3 Merge changes I37c8daa6,I5a05b65d,If56347fd
* changes:
  Preload2: Add isSingleThreaded
  Preload2: Fix action inheritance
  Preload2: Abstract out UI
2016-11-29 03:08:20 +00:00
Stephen Chen
767e453cdf 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
2016-11-28 16:26:16 -08:00
Andreas Gampe
3bf65c916c Preload2: Add isSingleThreaded
Expose whether a UI is single-threaded to avoid spawning threads
in actions.

Bug: 31961946
Test: manual
Change-Id: I37c8daa6a00784e833bad53b8e83ab4417955df7
2016-11-28 15:06:35 -08:00
Andreas Gampe
1c809a3d32 Preload2: Fix action inheritance
Use AbstractThreadedAction as a base.

Bug: 31961946
Test: manual
Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
2016-11-28 15:04:25 -08:00
Andreas Gampe
5cb8998363 Preload2: Abstract out UI
Create IUI interface and move UI to SwingUI.

Bug: 31961946
Test: manual
Change-Id: If56347fdde8b441c0c01337a3f5eac002ea5b4f3
2016-11-28 13:15:10 -08:00
Hall Liu
01106c45ca Merge "Add removeState method to StateMachine"
am: 0310de1136

Change-Id: Ib7d8e435c76bc7bcd83d6350c3c0622bb44d6552
2016-11-28 20:58:43 +00:00
Hall Liu
0310de1136 Merge "Add removeState method to StateMachine" 2016-11-28 20:52:02 +00:00
Paul Duffin
21cf84f8b3 Use junit-host instead of junit
Bug: 30188076
Test: make checkbuild
Change-Id: I5d3efbfbe3245a631113674bff1b0aabdc9fe8be
2016-11-28 16:44:44 +00:00
Nicolas Geoffray
99ae18486c Merge "Use the new refined DexOptNeeded codes."
am: d7e597a2e7

Change-Id: I58fbb54b94350e633fdd38cfb984de87a1862fd2
2016-11-28 13:25:06 +00:00
Nicolas Geoffray
d7e597a2e7 Merge "Use the new refined DexOptNeeded codes." 2016-11-28 13:15:56 +00:00
Nicolas Geoffray
79c9e06320 Use the new refined DexOptNeeded codes.
bug: 30937355
Test: device boots, messages are printed correctly
Change-Id: Ia5274e3659471c2a52244d5838d207d407e79023
2016-11-28 08:51:36 +00:00
Paul Duffin
c62c3a51d5 Merge "Move JUnit classes from here into external/junit"
am: 552744390f

Change-Id: I994dc5533d4f1dad35a161e998f57ecab56ab8a3
2016-11-24 11:57:48 +00:00
Paul Duffin
b9e33cd549 Move JUnit classes from here into external/junit
am: 0342ab5b94

Change-Id: I9111fe5e643794452008cf2cad933da0ca15bd00
2016-11-24 11:52:23 +00:00
Paul Duffin
552744390f Merge "Move JUnit classes from here into external/junit" 2016-11-24 11:44:02 +00:00