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

13483 Commits

Author SHA1 Message Date
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:56:02 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Christopher Tate
fb4fde7053 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 
automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:52:57 +00:00
Christopher Tate
78a05de82d Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev 
automerge: 14c33f6

* commit '14c33f6a716f224d1bc821cd8aa062f5734c29bf':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:02:23 +00:00
Christopher Tate
0721a94630 Don't try to launch broadcast receivers during boot 
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed.  Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.

Bug 19060618

Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
 2015-01-20 14:29:22 -08:00
Geoff Mendal
2c8e6daab7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-16 20:40:18 +00:00
Geoff Mendal
f1270cfb84 Import translations. DO NOT MERGE 
Change-Id: Ib02415ea924e876ae776b34ed271dcae2b9afbb1
Auto-generated-cl: translation import
 2015-01-16 12:37:30 -08:00
Winson Chung
57653fc4a4 am 898290af: am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '898290afd55733b09a98eb15f6c71d6aaad75072':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:22:44 +00:00
Winson Chung
898290afd5 am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '166cf980afafb83add7479cfeb3a8e0283cfee81':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:15:30 +00:00
Winson Chung
166cf980af Merge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 2015-01-16 20:09:40 +00:00
Winson Chung
5675f01868 DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531) 
We can use our normal visibility check to dismiss Recents when the screen is off,
since the system broadcast can occur after the activity is stopped.  We should use
the same mechanism we use to test visibility when launching Recents and just see
if it is the top most activity.

Change-Id: Ib9c01e78fd9221c4fb0ffcc80a01a0c58fb96836
 2015-01-15 11:27:43 -08:00
Robert Greenwalt
2ffe412b0e Rerun entitlementcheck on sim change. 
Only run if entitlement is needed and tethering is running.

bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
 2015-01-14 16:55:38 -08:00
Michael Wright
31572ede1c am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '5497e99c4a749a46b8e9f8312d01639987ba81a0':
  Clean up graphics resources.
 2015-01-14 21:32:37 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
 2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Christoph Studer
4d5e761a34 am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit 'a80da9d069ba3db60b9b43b4e10294a1700e9ca5':
  SysUI: Log lockscreen gestures
 2015-01-14 19:24:42 +00:00
Jorim Jaggi
87f536948c am c1691e3f: am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit 'c1691e3f8b148bc0a986fa7d4c4bfaee56c6442c':
  Only notify SIM state changes when it has actually changed
 2015-01-14 19:24:36 +00:00
Christoph Studer
f4e943e8a6 am 2d26435f: am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit '2d26435f0e8a46f3653fb6f25dbfd92d90b8d80e':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 19:24:30 +00:00
Christoph Studer
a80da9d069 am b018399a: SysUI: Log lockscreen gestures 
* commit 'b018399a3a2762e95126acbe14397eca15bad772':
  SysUI: Log lockscreen gestures
 2015-01-14 15:27:02 +00:00
Jorim Jaggi
c1691e3f8b am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit '86e1788db46cdbcc65331dd8d0b9e23241a534fe':
  Only notify SIM state changes when it has actually changed
 2015-01-14 15:16:12 +00:00
Christoph Studer
2d26435f0e am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit 'bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 15:16:07 +00:00
Christoph Studer
b018399a3a SysUI: Log lockscreen gestures 
Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
 2015-01-14 15:15:58 +00:00
Jorim Jaggi
86e1788db4 Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 2015-01-14 15:13:09 +00:00
Christoph Studer
bd0db7b18f Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 2015-01-14 15:10:53 +00:00
Lorenzo Colitti
51d281ee41 am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '792fd3d1eea0d4e1c69480684cf3be4e4c215ace':
  Switch the connectivity check to its own hostname.
 2015-01-14 12:06:31 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
 2015-01-14 11:59:46 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname. 
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
 2015-01-14 08:06:56 +09:00
Jorim Jaggi
01ba98b856 Only notify SIM state changes when it has actually changed 
onSubscriptionInfoChanged gets called quite frequently whenever
something about the connectivity changes, which could lead that the
whole state of the Keyguard was reset. This change actually checks
whether the state has really changed and thus only resets Keyguard
when necessary.

Bug: 18821582
Change-Id: Ia70804d0337b11914c7d57aa4cdc47d585786f1d
 2015-01-13 21:46:43 +01:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Michael Wright
2ed0513f20 Clean up graphics resources. 
Release SurfaceTexture after use in ColorFade and delete GL resources
in ImageWallpaper.

Bug: 17871993
Change-Id: I05bda03657ca502ba35b7187b6f361018f7ef687
 2015-01-12 15:31:02 -08:00
Jason Monk
2168062b23 am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
automerge: a50a668

* commit 'a50a66824c3cb17bc618b4e2ca3166003b6ddc26':
  Carrier text handle sim removal
 2015-01-12 21:08:38 +00:00
Jason Monk
a50a66824c am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
* commit '0a1eb640d29830813bb478b8635763a708b6310c':
  Carrier text handle sim removal
 2015-01-12 21:06:46 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Jason Monk
afeefb63c6 am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
automerge: 3454612

* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
  Avoid showing emergency calls when not possible
 2015-01-12 16:28:02 +00:00
Jason Monk
3454612e2c am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
* commit 'd74a331ae16b17cf1967186b5392676d2e3c427c':
  Avoid showing emergency calls when not possible
 2015-01-12 16:25:56 +00:00
Jason Monk
d74a331ae1 Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 2015-01-12 14:01:04 +00:00
Jason Monk
6c985dcc2d Carrier text handle sim removal 
Have KeyguardUpdateMonitor send the onRefreshCarrierInfo when the
subscription info changes, regardless of whether there are any
subscriptions (because there might be no sims).

Bug: 18752587
Change-Id: I8976c76aae9e3e633b6adace48dccb1e940dbc18
 2015-01-09 16:07:14 -05:00
Christopher Tate
f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:20:01 +00:00
Christopher Tate
68dabada9e am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
* commit 'a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:16:21 +00:00
Christopher Tate
cab915a327 Exclude ephemeral networks from wifi backup 
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
 2015-01-08 19:05:04 -08:00
Jason Monk
b36becff08 Avoid showing emergency calls when not possible 
Tablets aren't phones, so we shouldn't be showing an emergency calls
only message when in airplane mode or no sims are in them.

Bug: 18897573
Change-Id: I8cf31fe73dfd6dfd672a5ee58524815475a76c9c
 2015-01-08 11:12:39 -05:00
Shishir Agrawal
08fb858f82 am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '918866778f232ce07b1c2c2d6ea43bf5f0ce827f':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:48:11 +00:00
Shishir Agrawal
918866778f am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:43:09 +00:00