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
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
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
Amith Yamasani
deaa3d089d
Merge "Allow for uninstalled apps in ShortcutManager" into nyc-dev
...
am: a8242fa442
* commit 'a8242fa442fabf4c19d35d961104fdde68ceaf0d':
Allow for uninstalled apps in ShortcutManager
2016-03-04 01:04:40 +00:00
Amith Yamasani
a8242fa442
Merge "Allow for uninstalled apps in ShortcutManager" into nyc-dev
2016-03-04 01:02:31 +00:00
Felipe Leme
923845fdaa
Handles blacklist on getRestrictBackgroundStatus().
...
Initial implementation of getRestrictBackgroundStatus() was just
handling the whitelist status of apps when data saver is turned on, but
when an app is blacklisted, it should return
RESTRICT_BACKGROUND_STATUS_ENABLED regardless of the data saver status.
BUG: 27432317
Change-Id: I5a027d8b7d17a13075510ff8f29d41eaa5a6beb8
2016-03-03 17:01:31 -08:00
Dianne Hackborn
57d161fa10
Merge "Work on issue #27381069 : Master tracking bug: NYC is Sluggish" into nyc-dev am: ac31e09ce9
...
am: cf4c2b3b92
* commit 'cf4c2b3b92c08147ec331893f96c0a58f8327b10':
Work on issue #27381069 : Master tracking bug: NYC is Sluggish
2016-03-04 01:00:56 +00:00
Julia Reynolds
f816b32226
Merge "Only noisy notifications can be bumped for intrusiveness." into nyc-dev am: a87e9bc0b3
...
am: f69ff5d7de
* commit 'f69ff5d7de50b5a194c0b8d2b454a5f660fccc01':
Only noisy notifications can be bumped for intrusiveness.
2016-03-04 00:57:38 +00:00
Felipe Leme
2a76eb0638
Merge "Code cleanup on NMPS and NMS." into nyc-dev
...
am: 3ce000e647
* commit '3ce000e647da42c0f39b70dceabbaa52b8ef5ca3':
Code cleanup on NMPS and NMS.
2016-03-04 00:55:02 +00:00
Felipe Leme
3ce000e647
Merge "Code cleanup on NMPS and NMS." into nyc-dev
2016-03-04 00:46:28 +00:00
Todd Kennedy
84e7e7c02f
Merge "Splits without restart" into nyc-dev am: e8498cd006
...
am: 75c1fb0f48
* commit '75c1fb0f482e26ace2e4c6163ed3c48312f6bbef':
Splits without restart
2016-03-04 00:45:02 +00:00
Felipe Leme
03e689db51
Code cleanup on NMPS and NMS.
...
- Always check for DBG before using Slog.d.
- Logs duration of NMS.systemReady() when debugging.
- Logs duration of NMPS.updateRulesForGlobalChangeLocked() when debugging.
- Removed redundant toString() calls.
- Catch multiple exceptions.
- Replaced enhanced for on nested Iterable iterations.
BUG: 21725996
Change-Id: Ia775a394b59de7a0570ad4954d1fe3a2698c66d6
2016-03-03 16:41:39 -08:00
Robert Carr
7b8cedc4fc
Merge "Reimplement PIP animation to not use drag resizing." into nyc-dev am: adef831761
...
am: 10312fdfc6
* commit '10312fdfc623b0e1b368b1af10e0cfb1f9c87161':
Reimplement PIP animation to not use drag resizing.
2016-03-04 00:19:27 +00:00
Robert Carr
986126b54a
Merge "Ensure we apply override configuration to the global one." into nyc-dev am: e0a1e3ae71
...
am: 1bcb0fd20f
* commit '1bcb0fd20f3acf60cb2623860b6df9f903766dd5':
Ensure we apply override configuration to the global one.
2016-03-04 00:16:48 +00:00
Robert Carr
2f9ca5aa15
Merge "Update mCompatFrame in applyGravityAndUpdateFrame." into nyc-dev am: 1493fdd325
...
am: b9b29e1a60
* commit 'b9b29e1a60229040e8211f52753459bc2e4b9771':
Update mCompatFrame in applyGravityAndUpdateFrame.
2016-03-04 00:13:56 +00:00
Robert Carr
b9ef3476de
Merge "Fix pinned stack frame computation." into nyc-dev am: acd7a22cd7
...
am: de3d71955b
* commit 'de3d71955b0cd01259d2545719cd592e2ef4b0a7':
Fix pinned stack frame computation.
2016-03-04 00:11:24 +00:00