Commit Graph

297011 Commits

Author SHA1 Message Date
jackqdyulei
c48ea683eb Add tint for cast icon
Bug: 32592245
Test: Manual
Change-Id: I9893f308739594540baa1720b994403070eb2bd1
2016-12-05 10:00:40 -08:00
TreeHugger Robot
df68c9119c Merge "Make LD stateful / opacity management look more like DC" 2016-11-29 18:05:39 +00:00
Philip P. Moltmann
6fc01e0483 Merge "Create actions for permission and log revokations" 2016-11-29 17:46:32 +00:00
TreeHugger Robot
0884abb8ff Merge "Revert "Yet another interface that should be oneway."" 2016-11-29 17:38:37 +00:00
TreeHugger Robot
d738d1beab Merge "Fix hwui compile error only seen with debug switch." 2016-11-29 17:22:42 +00:00
Victor Chang
e061a79041 Merge "Add EXTRA_PROVISIONING_SKIP_USER_CONSENT" 2016-11-29 17:15:55 +00:00
Jorim Jaggi
fd97505fe9 Let lock icon reappear after fingerprint draw off am: f6103695f8
am: a034e7b47e

Change-Id: Ia2498fe32cca8d0e0e419293806f5759d018228e
2016-11-29 16:57:49 +00:00
Jorim Jaggi
a034e7b47e Let lock icon reappear after fingerprint draw off
am: f6103695f8

Change-Id: I4164417babaea46cce421d82530597b6e743e34b
2016-11-29 16:52:20 +00:00
Michal Karpinski
69beada2b5 Merge "Fix Lint errors for network logging API" 2016-11-29 16:42:42 +00:00
TreeHugger Robot
26b4494808 Merge "Improve "Try again in 1 seconds" behavior in lockscreen" 2016-11-29 16:41:10 +00:00
TreeHugger Robot
b57bd791bf Merge "Add user affiliation APIs" 2016-11-29 16:09:10 +00:00
Jeff Sharkey
0cfd60888d Revert "Yet another interface that should be oneway."
This reverts commit 55079a9ec2.

Change-Id: Id6d46d2ac2698068b8c78e03c15a4f2047f97e20
2016-11-29 15:41:39 +00:00
Paul Duffin
10a9bd905c Merge "Use junit-host instead of junit" am: 6063357ae6 am: 6fc0c5ceca am: 32317b3c8d
am: 29bf88aca9

Change-Id: I2f75d5e80d9baa411e7816958d4a6d6d220d0ba9
2016-11-29 15:31:57 +00:00
Paul Duffin
29bf88aca9 Merge "Use junit-host instead of junit" am: 6063357ae6 am: 6fc0c5ceca
am: 32317b3c8d

Change-Id: I2365d6d5f6f93f681cf1277df8356452b0c0f0f3
2016-11-29 15:26:50 +00: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
Jorim Jaggi
f6103695f8 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
(cherry picked from commit 8dea48c87e)
2016-11-29 15:05:18 +00:00
Paul Duffin
6063357ae6 Merge "Use junit-host instead of junit" 2016-11-29 15:01:32 +00:00
TreeHugger Robot
5ba211a6b8 Merge "Let lock icon reappear after fingerprint draw off" 2016-11-29 14:53:50 +00:00
Android Build Merger (Role)
4c7b252d85 Merge "Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56daac am: ef4267e53a am: e2ccdd9d93 am: fe9e70db6f" 2016-11-29 14:53:27 +00:00
Mike Reed
338da9c8f9 Merge "SkCanvas is no longer reference-counted" 2016-11-29 14:52:49 +00:00
Mark Lu
b866006143 Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56daac am: ef4267e53a am: e2ccdd9d93
am: fe9e70db6f

Change-Id: Ibd65beb3ba4968eac43b2255e8a3ffcb8d6976f9
2016-11-29 14:52:49 +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
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
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
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
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
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
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