Commit Graph

301953 Commits

Author SHA1 Message Date
Mark Lu
fe9e70db6f Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56daac am: ef4267e53a
am: e2ccdd9d93

Change-Id: I4b4194468b08a568963c8dd223d5192ae3041806
2016-11-29 14:47:46 +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
8d86417c8e Merge "Fix scrim handling when dismissing Keyguard in occluded case" 2016-11-29 14:31:54 +00:00
TreeHugger Robot
d25cf04e98 Merge "Add explicit method to dismiss Keyguard" 2016-11-29 14:30:46 +00:00
Treehugger Robot
21ed56daac Merge "[AM] Fix system server may killed when monkey crash." 2016-11-29 14:23:03 +00:00
Kenny Guy
02c8990bd6 Allow overriding max profile in debugable builds.
Support a system property on debugable builds to
override the max number of managed profiles to
allow easier dogfooding of multiple profiles.
Support 3 different badge colours for managed profiles.

Bug: 30473760
Test: runtest -c com.android.server.pm.UserManagerServiceCreateProfileTest frameworks-services
Test: runtest -c com.android.server.pm.UserManagerServiceUserInfoTest frameworks-services
Test: manual - attempting to create 2 profiles with adb fails, passes once I set the property.
Change-Id: Ie7fb19048a04a01572666f229283152254d0ffc3
2016-11-29 14:09:37 +00:00
Hidenari Koshimae
5be868c590 Improve "Try again in 1 seconds" behavior in lockscreen
When user fails an authentification in lockscreen many times,
"Try again in 30 seconds." is displayed and a 30 seconds
timer starts to count backwards.

This lets "Try again in 1 seconds" to be displayed for one second.

Bug: 31078006
Change-Id: I6c7de2b751582bb06a93e583b710f83201da1728
2016-11-29 14:48:46 +01:00
Jorim Jaggi
3448bdd340 Don't disable search on Keyguard
Test: Long-press home while Keyguard is occluded, make sure voice
interactor is invoked.
Bug: 33110839

Change-Id: I24a31e1a8a4d7ab9706cdbdb76123165c73e5052
2016-11-29 14:44:02 +01:00
Jorim Jaggi
e93698b8e0 Fix scrim handling when dismissing Keyguard in occluded case
Test: Manual, no security, Keyguard occluded, pull down shade,
press settings, ensure smooth scrim animation.
Test: Manual, with pattern, Keyguard occluded, pull down shade,
press settings, solve pattern, ensure smooth scrim animations.

Change-Id: I74e13844573e94d9fdc016ba33171c7c64a4f0f4
2016-11-29 13:14:28 +00:00
Jorim Jaggi
8dea48c87e Let lock icon reappear after fingerprint draw off
Test: Unlock with fingerprint, observe icon
Test: Unlock with fingerprint while collapsing panel, make sure
icon reappears after 800ms.

Change-Id: I8b081445bdaaa68741e4bab57a6f79f6e12f1d54
Fixes: 30507748
2016-11-29 14:12:09 +01:00
Paul Duffin
bf7d366cee 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.

(cherry picked from commit bc90fcb983bb8d8066d50de90af5190a07c0a7f4)

Bug: 30188076
Test: make legacy-test and check contents of generated legacy-test artifacts
Change-Id: I7cdbeff5d95473ec2bfe6341d3957cf38d98e933
2016-11-29 12:46:53 +00:00
Jorim Jaggi
3e68bb5d28 Merge "Execute app transition when start locking task" 2016-11-29 12:22:34 +00:00
Jorim Jaggi
6afa1c78ce Merge "Make LockoutResetCallback oneway" 2016-11-29 12:22:09 +00:00
Esteban Talavera
c9bb378a8b Add user affiliation APIs
Make setAffiliationIds public so that it can be used for COMP.
That way we can allow network logging and other features to
work on devices that have a DO and a managed profile.
Those features are currently restricted to single user devices but we'll
open them up to devices where all users are affiliated.

Also create a getter for that API.

Bug: 32326223
Test: m FrameworksServicesTests &&
 adb install \
   -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
 adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest \
   -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ie443be887a6ca61a7f7a07e137757dceab7eb3d3
2016-11-29 12:15:09 +00:00
Narayan Kamath
6aef541c52 Merge "PackageManager: Avoid unnecessary calls to derivePackageAbi during boot scans" 2016-11-29 11:56:29 +00:00
Andrei Stingaceanu
0178c2392b AutoSize TextView (part 2) - benchmark number of sizes
Performance test for the number of sizes to choose from
when autosizing.

Tests for 5, 10, 50, 100, 300, 500, 1000, 10000 and
100000!!! different sizes.

Bug: 32740812
Bug: 32221168
Test: this is the test
Change-Id: I611bbf659e51d0236a2ddafb2e2498165cea07a0
2016-11-29 11:51:04 +00:00
TreeHugger Robot
69d9aec7c8 Merge "Remove static link in Android framework under /frameworks/base." 2016-11-29 11:35:15 +00:00
Narayan Kamath
bdcdeb4cc4 PackageManager: Avoid unnecessary calls to derivePackageAbi during boot scans
In most cases, we can safely use the values from package settings instead.
We do the work when we're in the middle of an upgrade or the first boot,
since we have no choice.

This saves about 200-400ms on package manager startup on a freshly wiped
device with no app installs. Savings are likely to grow linearly with
the number of installed apps.

Bug: 22063656
Test: make + manual testing.

Change-Id: I1b2bdc4df45f334620c1fb94d78276f0095d5ff8
2016-11-29 10:50:53 +00:00
Paul Duffin
4aab571757 Merge "Use junit-host instead of junit" am: 7dda7e1e81 am: bbb501281e am: 52277efa6c
am: 2d4183ffa5

Change-Id: I1cc3bc8b73d7756c850a1573ca5ff9090e64c184
2016-11-29 10:39:06 +00:00
Paul Duffin
2d4183ffa5 Merge "Use junit-host instead of junit" am: 7dda7e1e81 am: bbb501281e
am: 52277efa6c

Change-Id: I2576d681111d3e23fe7992473893cb53d7e90b15
2016-11-29 10:34:29 +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
Michal Karpinski
0879eb41ca Fix Lint errors for network logging API
Bug: 29748723
Change-Id: I6996162f0f20f6f1881cf5508d140b6f65bf11dc
2016-11-29 10:26:51 +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
Michal Karpinski
c6b4d6d23c Merge "Strong auth timeout for trust agents" 2016-11-29 10:09:09 +00:00
yirui
3002ab6729 Introduce font variation settings parser
Font variation settings enables developer to specify font axes for
configuring glyph looking. This CL parse Font Variation settings to
make a array of Axis. More work is needed for using parsed axes.

Bug: 33062398
Test: Done by unittests.
Change-Id: I529b98b28df1c738237bee0729d9f479bd656dd3
2016-11-29 18:04:03 +09:00
Daichi Hirono
116c376c73 Fix hwui compile error only seen with debug switch.
Bug: None
Test: Build succeeded
Change-Id: I26e3f4fdc10f27d7eb7f3987d0f3e5dfa1bc9f45
2016-11-29 16:09:59 +09:00
TreeHugger Robot
c3b93e78e1 Merge "Import translations. DO NOT MERGE" 2016-11-29 06:25:47 +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
TreeHugger Robot
d5e9190605 Merge "Import translations. DO NOT MERGE" 2016-11-29 06:18:54 +00:00
Android Build Merger (Role)
76725902d1 Merge changes from topic 'am-2f7a5b3d426742748bd60ca695e3c03a'
* changes:
  Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3 am: b4248148da am: f9e5488bd1 am: 6edb9856f7
  Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6 am: 80ae2ed225 am: 190dbbd0af
  Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7 am: 2b34ac2bd6 am: 26c94b7430
  Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96 am: eab0eadbf6 am: af5b2c3010
2016-11-29 03:50:31 +00:00
TreeHugger Robot
b6504180ec Merge "Add images to document built-in color spaces" 2016-11-29 03:48:51 +00:00
Andreas Gampe
a89cdda201 Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3 am: b4248148da am: f9e5488bd1
am: 6edb9856f7

Change-Id: I961f6c8c1fc5090b494dca61f35622003690bea9
2016-11-29 03:48:49 +00:00
Andreas Gampe
d6d10b6c78 Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6 am: 80ae2ed225
am: 190dbbd0af

Change-Id: I1728bb69b359ece93ba2e89f5aa86407e9b17787
2016-11-29 03:47:50 +00:00
Andreas Gampe
8e2338f72d Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7 am: 2b34ac2bd6
am: 26c94b7430

Change-Id: Ic6fde07acce3b6d0ab1708c3aff57e8aabb3fe96
2016-11-29 03:46:38 +00:00
Andreas Gampe
f237a11fb0 Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96 am: eab0eadbf6
am: af5b2c3010

Change-Id: I17fe36f9d2df61f0da1bc229f7a77a5e3f16f45b
2016-11-29 03:45:41 +00:00
Andreas Gampe
6edb9856f7 Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3 am: b4248148da
am: f9e5488bd1

Change-Id: I893ce5cab9f4b2a8130e8e9ad1133507cfb10cf0
2016-11-29 03:39:17 +00:00
Andreas Gampe
190dbbd0af Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6
am: 80ae2ed225

Change-Id: I893d5fcdd2ffb57db0adf0b40b9a065cc2d4841b
2016-11-29 03:38:04 +00:00
Andreas Gampe
26c94b7430 Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7
am: 2b34ac2bd6

Change-Id: Ib21bb8f92532497fcb46eb5c5485966d598264f6
2016-11-29 03:37:19 +00:00
Andreas Gampe
af5b2c3010 Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96
am: eab0eadbf6

Change-Id: Ie6ad17cb25e0d7e843d36ceaa28a7ee9fc78d792
2016-11-29 03:36:34 +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
Bill Yi
6dd90ac1f2 Import translations. DO NOT MERGE
Change-Id: I138a221a7ee2d186f87ff774c68e621ce354cb91
Auto-generated-cl: translation import
2016-11-28 19:26:00 -08: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