drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,079 Commits 1 Branch 0 Tags
Commit Graph

17463 Commits

Author SHA1 Message Date
Daniel Sandler
49ae8f2ef2 am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'd74681763c4ca9047b006efab5098a87e302f479':
  Crash apps with bad notification icons.
 2015-08-11 14:37:56 +00:00
Daniel Sandler
d74681763c am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '5bba07eb01d923beea173712295d6b10c9762400':
  Crash apps with bad notification icons.
 2015-08-11 14:29:39 +00:00
Daniel Sandler
5bba07eb01 am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
 2015-08-11 14:22:12 +00:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Winson Chung
bfa04f4998 am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'b12ca1635a81c5ab6b1d4dfa5cdf8e01612f8ca3':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:53:53 +00:00
Winson Chung
b12ca1635a am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'bc58c9453fd4f647a3382608f8de8e557854758d':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:47:48 +00:00
Winson Chung
bc58c9453f am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:40:05 +00:00
Winson Chung
c00b1067a0 Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 2015-08-11 02:33:15 +00:00
Jorim Jaggi
231bddea31 am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '1785c097ccaf9732902c2245fc63c4d044565ffa':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:53:44 +00:00
Jorim Jaggi
1785c097cc am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '3767d85caac8eec6c7c219de3d0a000fca18ad8b':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:45:32 +00:00
Jorim Jaggi
3767d85caa am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:39:43 +00:00
Jorim Jaggi
f8359cfb93 Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev 2015-08-11 01:31:56 +00:00
Chris Tate
d4c0b52e2a am 1e05bc6f: am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev 
* commit '1e05bc6f77b9e609df598ef0aed20a0ef81848a1':
  Fix wifi disable during restore
 2015-08-10 22:59:28 +00:00
Chris Tate
1e05bc6f77 am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev 
* commit '5ca842ae0836a8daa04fd57cfc56f8e3b3e5054c':
  Fix wifi disable during restore
 2015-08-10 22:51:28 +00:00
Winson
1df9c3c6bd Pushing the startActivity before the calls to remove task. 
- It appears that there is contention between startActivityAsUser() and
  removeTask() (called on two separate threads) which can cause jank when
  a user removes all the tasks from their recents list.  This CL ensures
  that startActivityAsUser() is always run first so it is not blocked
  by the other call (which should be able to run in the background
  uninterrupted).

Bug: 22760556
Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152
 2015-08-10 15:45:35 -07:00
Chris Tate
5ca842ae08 am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev 
* commit '5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
  Fix wifi disable during restore
 2015-08-10 22:40:25 +00:00
Chris Tate
5d05a24cff Merge "Fix wifi disable during restore" into mnc-dev 2015-08-10 22:33:05 +00:00
Dan Sandler
334398105f Crash apps with bad notification icons. 
This shouldn't happen, since there are many places where
invalid icons should already have been either fixed (in the
case where there's an .icon but no .mSmallIcon) or rejected
(if they're both null or invalid). But if a notification
makes it all the way to SystemUI without a valid icon, let's
crash the sender.

Bug: 23011305
Change-Id: Ifaebec57d59baa1defb4520178b5815d47ed5712
 2015-08-10 16:04:12 -04:00
Jason Monk
fcb34b419d am 850e5ee1: am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev 
* commit '850e5ee16353cfcde553fe5d86c50f508a82c44a':
  Initialize network name better in NetworkController
 2015-08-10 15:10:29 +00:00
Jason Monk
850e5ee163 am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev 
* commit 'a5c0c209c501793c80e9197d89e71123572ac2f8':
  Initialize network name better in NetworkController
 2015-08-10 15:03:59 +00:00
Jason Monk
a5c0c209c5 am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev 
* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController
 2015-08-10 14:56:52 +00:00
Jason Monk
00aa9d4427 Initialize network name better in NetworkController 
Initialize current network name to correct value from the
SubscriptionInfo until we get a broadcast about its current state.

Bug: 22212693
Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40
 2015-08-10 10:29:47 -04:00
Geoff Mendal
e53e421e1e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-08 14:21:20 +00:00
Geoff Mendal
ba4a568cf8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-08 14:20:49 +00:00
Geoff Mendal
bdd5db78c7 Import translations. DO NOT MERGE 
Change-Id: I2bf98a2ed7790b147b2b13c460a52bb79c4b8db7
Auto-generated-cl: translation import
 2015-08-08 07:16:18 -07:00
Geoff Mendal
283c030130 Import translations. DO NOT MERGE 
Change-Id: Ib02888af570eee35060b2c624eaaaee25df11ea6
Auto-generated-cl: translation import
 2015-08-08 07:14:55 -07:00
Geoff Mendal
2393f7e282 Import translations. DO NOT MERGE 
Change-Id: I8efa511283a9b372c6386dd3a3396abee1d10780
Auto-generated-cl: translation import
 2015-08-08 07:13:01 -07:00
Christopher Tate
45dc0d03fd Fix wifi disable during restore 
The main looper needs to run freely for a moment after disabling
wifi in order for various signals (content observers, broadcast) to
propagate to all the listeners that need to take action for the
wifi stack to shut all the way down.  This patch breaks up the
disable-and-rewrite-config sequence of wifi AP restore in to two
distinct operations separated by a moment so as not to block those
necessary messages.

Bug 22979342

Change-Id: I271766cad0e454669a194652fb67f835bb022cd1
 2015-08-07 19:20:05 -07:00
Julia Reynolds
3d66338016 am 51e2a467: am 04b96145: am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev 
* commit '51e2a4679c5e3dbad23cb1a8d33c1b13ace21ab9':
  Update Navigation bar assets.
 2015-08-07 19:39:24 +00:00
Julia Reynolds
51e2a4679c am 04b96145: am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev 
* commit '04b9614548b58e7672c1cfa65c47bff2eb7b1ac7':
  Update Navigation bar assets.
 2015-08-07 19:31:28 +00:00
Julia Reynolds
04b9614548 am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev 
* commit '9dc4d50be1db82359050fd082828680bde44b9fd':
  Update Navigation bar assets.
 2015-08-07 19:24:12 +00:00
Julia Reynolds
9dc4d50be1 Merge "Update Navigation bar assets." into mnc-dev 2015-08-07 19:19:02 +00:00
Jason Monk
635270c5b6 am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev 
* commit 'a01965e22aafa58e7226dd2f0691985f3e8713ae':
  Allow system to disable lockscreen
 2015-08-07 19:13:56 +00:00
Jason Monk
a01965e22a am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev 
* commit '69a07d401a3d40de6d5f17eeaf642db12401fe2f':
  Allow system to disable lockscreen
 2015-08-07 18:54:57 +00:00
Jason Monk
69a07d401a am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev 
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen
 2015-08-07 18:46:58 +00:00
Chris Tate
94275813c2 am 117f024b: am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev 
* commit '117f024b2566e8cce7b0d0669ce528dac7aa23ac':
  Wait a bit longer for wifi to shut down before rewriting the config
 2015-08-07 18:40:38 +00:00
Jason Monk
69ed33087d Merge "Allow system to disable lockscreen" into mnc-dev 2015-08-07 18:40:19 +00:00
Chris Tate
117f024b25 am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev 
* commit 'db0cff71c8d1a7f7f1d5c12a4f7c343030adf21b':
  Wait a bit longer for wifi to shut down before rewriting the config
 2015-08-07 18:36:09 +00:00
Chris Tate
db0cff71c8 am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev 
* commit 'c376afb472d1d4f0fba4a03ac4cf05b498866d64':
  Wait a bit longer for wifi to shut down before rewriting the config
 2015-08-07 18:19:35 +00:00
Chris Tate
c376afb472 Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev 2015-08-07 18:15:19 +00:00
Julia Reynolds
ae4b8deada Update Navigation bar assets. 
Bug: 22855920
Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61
 2015-08-07 13:59:46 -04:00
Christopher Tate
907e01eb70 Wait a bit longer for wifi to shut down before rewriting the config 
We've seen case of it taking longer than 1500ms for the wifi system to
actually shut down after the triggering settings element is written,
so extend the wait time a bit.  We've seen it take more than 1500ms
but not more than 2500ms, so that's the new heuristic.

This will of course all become happily obsolete once we start
applying restored AP definitions programmatically rather than by
filesystem-level operations.

Bug 22979342

Change-Id: I6acf1baac23d4100124093128b82abf242b11a0e
 2015-08-07 10:57:01 -07:00
Jason Monk
2ba9fc1ba7 am e810b397: am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit 'e810b397471d786a3281de117db5a104365e719d':
  Use BluetoothController for status bar icon status
 2015-08-07 15:01:15 +00:00
Jason Monk
e810b39747 am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit '49541edbdbffb2058eed822675c5df5ccb9a7ba6':
  Use BluetoothController for status bar icon status
 2015-08-07 14:50:56 +00:00
Jason Monk
49541edbdb am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit '77566dd1e15353eb062503767c6e4a354303fd09':
  Use BluetoothController for status bar icon status
 2015-08-07 14:44:22 +00:00
Jason Monk
77566dd1e1 Merge "Use BluetoothController for status bar icon status" into mnc-dev 2015-08-07 14:38:29 +00:00
Jason Monk
b978ce7f25 Allow system to disable lockscreen 
Even when there is a pin.

Bug: 22920549
Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373
 2015-08-07 09:21:51 -04:00
Winson Chung
1353b0f5e6 am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit '6bf21c3a06c9f08a650d5f2aadd29389c636fb1e':
  Fixing issue with empty Recents screen.
 2015-08-06 22:08:33 +00:00
Winson Chung
6bf21c3a06 am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'b762a9a579eb4dd8f58932d4f1284cae7727cd00':
  Fixing issue with empty Recents screen.
 2015-08-06 22:01:25 +00:00
Winson Chung
b762a9a579 am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'bb55aa1a93cee91a40b6f5941675682cb6f8a83b':
  Fixing issue with empty Recents screen.
 2015-08-06 21:53:03 +00:00