Commit Graph

277808 Commits

Author SHA1 Message Date
vinodkrishnan
ff6ff81345 Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
am: a0d9383f71

Change-Id: Ib6cce473f9d39835fbaebfff00498320ea039bc8
2016-11-30 21:55:23 +00:00
vinodkrishnan
afd52a7ad4 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
am: 7b62df8556

Change-Id: I7c8d922fb125bf786990642679ebdd17ba589a54
2016-11-30 21:52:13 +00:00
TreeHugger Robot
a0d9383f71 Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev 2016-11-30 21:43:38 +00:00
vinodkrishnan
7b62df8556 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
This reverts commit 8500f26d51.

Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
2016-11-30 20:09:59 +00:00
Etan Cohen
1c92763087 Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad
am: ad299d38ff

Change-Id: I9834f0e2687685a52970ab406a411217cc2eeec9
2016-11-30 17:14:14 +00: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
783096f02c Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f
am: a485fa1fce

Change-Id: I578b109bc0a4f8655643dad1092b46296ff18114
2016-11-30 12:20:11 +00: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
e5a3ad23fd Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc
am: 15df815e1e

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7
2016-11-30 09:19:26 +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
Anthony Hugh
f3eef9a286 Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am: 75bf81458e

Change-Id: I82abdf00c00d2a735e6723d8a175f152be982aff
2016-11-30 03:28:44 +00:00
Anthony Hugh
32a0b7351e DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am: f73d085395

Change-Id: I6d17a74e4030e20b7a08516d0b4ec90e31930c66
2016-11-30 03:28:37 +00:00
TreeHugger Robot
75bf81458e Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev 2016-11-30 03:09:24 +00:00
Andreas Gampe
04cbf97d38 Merge "Preload2: Add sequence UI" am: 56ddac7fd7
am: b9d8535a21

Change-Id: I721674c8381caa9c404c3708122f03d6c8d6d204
2016-11-30 00:59:23 +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
Anthony Hugh
f73d085395 DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
It looks like there was a regression where #onNewIntent() was called
before the FLAG_ACTIVITY_BROUGHT_TO_FRONT flag was set.  This
change updates the code so we set the flag properly.

BUG: 33034247
Change-Id: I61959a289dc5af14ee9d3d7bfa213191238efc88
2016-11-30 00:00:15 +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
Paul Duffin
32317b3c8d Merge "Use junit-host instead of junit" am: 6063357ae6
am: 6fc0c5ceca

Change-Id: I107a1e13e3442113c8a92590156ad9362c3a12bb
2016-11-29 15:21:52 +00: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
e2ccdd9d93 Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56daac
am: ef4267e53a

Change-Id: I829756bc1b6277abd77a86e8e6a0e895bb55db80
2016-11-29 14:43:17 +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
52277efa6c Merge "Use junit-host instead of junit" am: 7dda7e1e81
am: bbb501281e

Change-Id: I4b4260849b69c2ce103b9ca2c37ec412892ccde0
2016-11-29 10:30:07 +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
f9e5488bd1 Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3
am: b4248148da

Change-Id: I7c3f020ee1f056585d63138e20700eb3bb4af692
2016-11-29 03:30:55 +00:00
Andreas Gampe
80ae2ed225 Preload2: Add isSingleThreaded am: 3bf65c916c
am: 57c14c8ee6

Change-Id: Idd590eb5a2f35c1aa37ded1cf596b5795a80c43f
2016-11-29 03:29:49 +00:00
Andreas Gampe
2b34ac2bd6 Preload2: Fix action inheritance am: 1c809a3d32
am: 24cd3418c7

Change-Id: I77cb0e7c2e27e4c802bfb9b5d150712c13ea10ab
2016-11-29 03:28:55 +00:00
Andreas Gampe
eab0eadbf6 Preload2: Abstract out UI am: 5cb8998363
am: 826ec71e96

Change-Id: I3ee7c197611931f6f21c49f41c3a17ef420499c7
2016-11-29 03:28:06 +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
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
Rubin Xu
c78751707c Fix boot loop when upgrading direclty from L to N am: bfc7faaf35
am: 492f5263a4

Change-Id: I22ddb905cf6ff4519dd12e84f5a51ea27d256602
2016-11-28 22:01:31 +00: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
1a8bdf8bf9 Merge "Add removeState method to StateMachine" am: 0310de1136
am: 01106c45ca

Change-Id: I4f31491b1c9db29fe14222788d7fbd1fd6bce068
2016-11-28 21:06:44 +00: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