Commit Graph

34634 Commits

Author SHA1 Message Date
Jean-Michel Trivi
46ef3bdf28 Merge "API changes for audio recording notifications" into nyc-dev am: b74926232e
am: 6bc51e0e5c

* commit '6bc51e0e5cb318bc9c1c92a1f70a434614a741fc':
  API changes for audio recording notifications
2016-03-04 22:56:10 +00:00
Jean-Michel Trivi
6bc51e0e5c Merge "API changes for audio recording notifications" into nyc-dev
am: b74926232e

* commit 'b74926232ee601851e08cd5d0f0386afcb0bef3e':
  API changes for audio recording notifications
2016-03-04 22:53:58 +00:00
Jean-Michel Trivi
b74926232e Merge "API changes for audio recording notifications" into nyc-dev 2016-03-04 22:49:31 +00:00
Joe Onorato
b686b03272 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev am: 5d4ab988bd
am: 15e93f3715

* commit '15e93f3715742d0ffad6089cf804842f2e5f393b':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-03-04 21:53:06 +00:00
Jeff Sharkey
870f4b6521 Merge "Log FBE related flags when dumping packages." into nyc-dev am: a561e3a3b7
am: 9d90a0f670

* commit '9d90a0f6706c5112710e7a84a5e1cf22ff9dd145':
  Log FBE related flags when dumping packages.
2016-03-04 21:50:38 +00:00
Joe Onorato
15e93f3715 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev
am: 5d4ab988bd

* commit '5d4ab988bd18bb1fc339f39d6f0cf225b6561903':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-03-04 21:48:35 +00:00
Jeff Sharkey
9d90a0f670 Merge "Log FBE related flags when dumping packages." into nyc-dev
am: a561e3a3b7

* commit 'a561e3a3b782be3aa859b8c93f78205db1b429d7':
  Log FBE related flags when dumping packages.
2016-03-04 21:45:54 +00:00
Joe Onorato
5d4ab988bd Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev
* changes:
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-03-04 21:39:14 +00:00
Jeff Sharkey
a561e3a3b7 Merge "Log FBE related flags when dumping packages." into nyc-dev 2016-03-04 21:35:35 +00:00
Suprabh Shukla
250d834e59 Merge "Not clearing data for a package that is a DO or PO" into nyc-dev am: e1fd7f09d5
am: 8f50b747ed

* commit '8f50b747ed1586081126d09aa78a72c1c2fc927f':
  Not clearing data for a package that is a DO or PO
2016-03-04 20:45:30 +00:00
Suprabh Shukla
8f50b747ed Merge "Not clearing data for a package that is a DO or PO" into nyc-dev
am: e1fd7f09d5

* commit 'e1fd7f09d5149055b8ad7bcf24846ecd8d87027a':
  Not clearing data for a package that is a DO or PO
2016-03-04 20:43:25 +00:00
Suprabh Shukla
e1fd7f09d5 Merge "Not clearing data for a package that is a DO or PO" into nyc-dev 2016-03-04 20:38:44 +00:00
Joe Onorato
12acbd7836 Turn down the logging a little bit.
Change-Id: Ib6e0e6f3577afac3b9bfe9a9b1cce70fb16d9d04
2016-03-04 12:21:30 -08:00
Joe Onorato
f188d41fa2 Turn down the logging a little bit and don't do a log wrapper function.
Change-Id: I109f04c2c2299f26e21b076df3a935ce2d356bdf
2016-03-04 12:21:30 -08:00
Joe Onorato
3973b1a75d Turn down the logging a little bit.
Change-Id: I810b9bd58412d2b38d8ce4497baa71047125b92f
2016-03-04 12:21:30 -08:00
Jeff Sharkey
effcd93594 Log FBE related flags when dumping packages.
Bug: 27455726
Change-Id: I18146431792d5be0808ff6044174eff328039251
2016-03-04 12:52:39 -07:00
Todd Kennedy
703df7f0fa Merge "dump apk signing version" into nyc-dev am: 40a6e6a10e
am: 8b25c1ba29

* commit '8b25c1ba294f2249e1cf16be87d97460248c3422':
  dump apk signing version
2016-03-04 18:39:28 +00:00
Todd Kennedy
8b25c1ba29 Merge "dump apk signing version" into nyc-dev
am: 40a6e6a10e

* commit '40a6e6a10e0b411fd7434d586f2323674b11b757':
  dump apk signing version
2016-03-04 18:37:39 +00:00
Yorke Lee
90bbe3974f Merge "Add config value to force nav bar to be opaque" into nyc-dev am: acc86abf82
am: db0a3dcb6a

* commit 'db0a3dcb6ae65ea5bcfdeec8d2a74b4fba51479c':
  Add config value to force nav bar to be opaque
2016-03-04 18:35:26 +00:00
Todd Kennedy
40a6e6a10e Merge "dump apk signing version" into nyc-dev 2016-03-04 18:34:00 +00:00
Yorke Lee
db0a3dcb6a Merge "Add config value to force nav bar to be opaque" into nyc-dev
am: acc86abf82

* commit 'acc86abf82b2dad283c31a1cbec7568695ebfd16':
  Add config value to force nav bar to be opaque
2016-03-04 18:33:31 +00:00
Yorke Lee
acc86abf82 Merge "Add config value to force nav bar to be opaque" into nyc-dev 2016-03-04 18:27:20 +00:00
Christopher Tate
06fe18dfa4 Merge "Don\'t use restricted backup launch mode for system-ish processes" into nyc-dev am: 2fad2ea0e6
am: d8aaf500bb

* commit 'd8aaf500bb68f5ae87bb3b8ef7cef98fb5987fb8':
  Don't use restricted backup launch mode for system-ish processes
2016-03-04 18:06:47 +00:00
Christopher Tate
d8aaf500bb Merge "Don\'t use restricted backup launch mode for system-ish processes" into nyc-dev
am: 2fad2ea0e6

* commit '2fad2ea0e622813ba153343e988da54ee1edbfc6':
  Don't use restricted backup launch mode for system-ish processes
2016-03-04 18:02:43 +00:00
Chris Tate
2fad2ea0e6 Merge "Don't use restricted backup launch mode for system-ish processes" into nyc-dev 2016-03-04 17:57:09 +00:00
Victor Chang
4c6294208d Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev am: 0114263a1a
am: 51296a5483

* commit '51296a548312799b5331714b5b581a064f80d737':
  enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode
2016-03-04 13:26:44 +00:00
Victor Chang
cca6e9a432 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev am: 915d524553
am: 37b5fb6556

* commit '37b5fb655628233e0a866cbe4f38386ea00021bc':
  isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked
2016-03-04 13:22:09 +00:00
Victor Chang
51296a5483 Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev
am: 0114263a1a

* commit '0114263a1aff5dea92fdafbec81c1b40093e9aba':
  enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode
2016-03-04 13:21:25 +00:00
Victor Chang
37b5fb6556 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev
am: 915d524553

* commit '915d5245533c449550b9dae54b71414394ae2d74':
  isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked
2016-03-04 13:18:52 +00:00
Victor Chang
0114263a1a Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev 2016-03-04 13:13:27 +00:00
Victor Chang
915d524553 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev 2016-03-04 13:13:14 +00:00
Victor Chang
e29cd4724f enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode
Bug: 27453111
Change-Id: I1acdfecdf4474696e904a6a4df189453be306aa4
2016-03-04 10:34:43 +00:00
Victor Chang
5676ae256a isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked
The main purpose is to fix the security flaw that
user can force isDeviceOwnerProvisioningAllowed to return true
by setting the device_provisioned without factory reset

Check UserSetupComplete instead, as it's cached by DPMS if it's ever set to true

Refactor common code of isDeviceOwnerProvisioningAllowed and enforceCanSetDeviceOwnerLocked
The functionality of enforceCanSetDeviceOwnerLocked should be exactly the same.
DPM Unit Test all pass

Bug:27403225
Change-Id: I32dae8e222e01e08664abb313ead3a92d4186658
2016-03-04 10:34:33 +00:00
Michal Karpinski
b04e2ada12 Merge "Rework of remote bugreports UX" into nyc-dev am: bf8f1cc3c0
am: 7371f4c9e6

* commit '7371f4c9e61948a13d654b3e10109c01b60feb8b':
  Rework of remote bugreports UX
2016-03-04 09:59:51 +00:00
Michal Karpinski
7371f4c9e6 Merge "Rework of remote bugreports UX" into nyc-dev
am: bf8f1cc3c0

* commit 'bf8f1cc3c0d9931828d166aea585b6b29d4c6664':
  Rework of remote bugreports UX
2016-03-04 09:57:55 +00:00
Michal Karpinski
bf8f1cc3c0 Merge "Rework of remote bugreports UX" into nyc-dev 2016-03-04 09:52:32 +00:00
Rakesh Iyer
8777b38419 Fix ActivityManager watchdog kill. am: 4f3fc21505
am: 64dfbf3bae

* commit '64dfbf3bae207c58c2c9a0001f57ca08749937e6':
  Fix ActivityManager watchdog kill.
2016-03-04 04:57:17 +00:00
Rakesh Iyer
64dfbf3bae Fix ActivityManager watchdog kill.
am: 4f3fc21505

* commit '4f3fc215050bb52d470fc7d6b1fd2eeb39c2119b':
  Fix ActivityManager watchdog kill.
2016-03-04 04:55:20 +00:00
Rakesh Iyer
4f3fc21505 Fix ActivityManager watchdog kill.
Typo caused an infinite loop causing a watchdog kill.

Change-Id: If9a8973c28e284d993d81ba7d6724f9575a30c92
2016-03-03 20:48:15 -08:00
Wale Ogunwale
65219c9a79 Clear app token mAppStopped when app resumes. am: 8d5a542f66
am: 439381fdbc

* commit '439381fdbcc8f6136fd991482466f95ef2b18cbd':
  Clear app token mAppStopped when app resumes.
2016-03-04 03:10:08 +00:00
Wale Ogunwale
439381fdbc Clear app token mAppStopped when app resumes.
am: 8d5a542f66

* commit '8d5a542f66beae774354038f15dd1afe7fcf754b':
  Clear app token mAppStopped when app resumes.
2016-03-04 03:08:16 +00:00
Wale Ogunwale
8d5a542f66 Clear app token mAppStopped when app resumes.
It is possible for an activity to be in the stopped state without
setting it's visiblility to false in window manager.
For example, the home acitivty behind the lock screen. Since the
lock screen isn't an activity it doesn't affect the visiblity set
of the home activity, so AM doesn't tell WM to hide the app token.
However, AM uses another channel to detect that the device is locked
and moves the activity into stopped state. WM on the other hand also
detects that the device is locked and hides the window surfaces of
all windows behind the lock screen. So, at this point AM has also
told WM that the activity is stopped. Once you unlock the screen
AM resumes the activity but doesn't report any visiblility changes to WM
since it's internal state didn't change. So, if you go from the home
activity to another app the home activity window will be destroyed
before the activity is stopped because mAppStopped is set to true.
We now set mAppStopped to false when the activity is resumed.

Bug: 27286867
Change-Id: Ic75456d30abd582fa44f932f5aeeb449950157ee
2016-03-03 18:59:26 -08:00
Dianne Hackborn
7069968c96 Merge "Don\'t need this "feature" any more." into nyc-dev am: 34640a17a2
am: d74eebe2bf

* commit 'd74eebe2bf62623505de6e8e40b4e4a736d3d2c5':
  Don't need this "feature" any more.
2016-03-04 01:55:19 +00:00
Dianne Hackborn
d74eebe2bf Merge "Don\'t need this "feature" any more." into nyc-dev
am: 34640a17a2

* commit '34640a17a25a60d7dc342051153e0d282d7c06ea':
  Don't need this "feature" any more.
2016-03-04 01:53:24 +00:00
Dianne Hackborn
34640a17a2 Merge "Don't need this "feature" any more." into nyc-dev 2016-03-04 01:50:47 +00:00
Felipe Leme
d798442c38 Merge "Handles blacklist on getRestrictBackgroundStatus()." into nyc-dev am: 7af0be288e
am: 109c8db43b

* commit '109c8db43b0f44fe96d0702a85424395371dfa8e':
  Handles blacklist on getRestrictBackgroundStatus().
2016-03-04 01:48:12 +00:00
Felipe Leme
109c8db43b Merge "Handles blacklist on getRestrictBackgroundStatus()." into nyc-dev
am: 7af0be288e

* commit '7af0be288e3bce8c97e8e830025e011f9686bb42':
  Handles blacklist on getRestrictBackgroundStatus().
2016-03-04 01:45:51 +00:00
Felipe Leme
7af0be288e Merge "Handles blacklist on getRestrictBackgroundStatus()." into nyc-dev 2016-03-04 01:39:31 +00:00
Amith Yamasani
c7da972a9e Merge "Allow for uninstalled apps in ShortcutManager" into nyc-dev am: a8242fa442
am: deaa3d089d

* commit 'deaa3d089db7a572ef4822338610eae1f23020e9':
  Allow for uninstalled apps in ShortcutManager
2016-03-04 01:19:41 +00:00
The Android Automerger
1ccd57a91c Merge commit '22e01d5611d14cc04055b8abcbd1e8c114a0853c' 2016-03-04 01:05:11 +00:00