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

16933 Commits

Author SHA1 Message Date
Chris Wren
a35c96eb90 add metrics to assistant 
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
 2015-08-06 15:11:42 -04:00
Jim Miller
b29814c4cc Don't show fingerprint cancellation messages in keyguard 
Cancellation messages can come from a variety of sources
and are not user-actionable.  As a result, we just shouldn't
show them.

Fixes bug 22863862

Change-Id: I2154c774fd5ac7477e01d1cbf3bdde2d1929363b
 2015-08-06 02:39:06 +00:00
Mitchell Wills
104999b957 am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit 'd14c48444a40fa2f964461e2f1317bcc3e256295':
  Pass connection configuration when setting wifi info
 2015-08-06 02:29:19 +00:00
Mitchell Wills
d14c48444a Merge "Pass connection configuration when setting wifi info" into mnc-dev 2015-08-06 02:23:44 +00:00
Jim Miller
6fdb85d383 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:43:13 +00:00
Mitchell Wills
5a42db2e9c Pass connection configuration when setting wifi info 
This allows the both the ssid and connection info to be verified when
updating wifi info.

Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
 2015-08-05 15:39:19 -07:00
Jim Miller
8ae1be1208 Disable fingerprint when remotely reset by DPM 
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password).  This disables fingerprint like we do with
trust agents.

Fixes bug 21620081

Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
 2015-08-05 20:06:37 +00:00
Geoff Mendal
90b6961570 Import translations. DO NOT MERGE 
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
 2015-08-05 06:53:22 -07:00
Jason Monk
bbb1776581 am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev 
* commit '55dbf2d78e575b6c7b53e06aed17ff7406305a13':
  QS: Allow Flashlight Tile to handle reset state
 2015-08-04 13:52:34 +00:00
Jason Monk
55dbf2d78e Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev 2015-08-04 13:43:21 +00:00
Prem Kumar
482ba34383 am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 
* commit '04e2cf6bc5167583d686c2a118ec2b50a7b88547':
  Make default selection for contact sharing to "Checked".
 2015-08-04 01:00:47 +00:00
Svetoslav Ganov
ba6cdbfdbb am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev 
* commit 'ac8c98614cb8260615795b2042699d93b21a1097':
  Notify settings URI change without a lock held
 2015-08-04 01:00:17 +00:00
Prem Kumar
04e2cf6bc5 Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 2015-08-04 00:41:46 +00:00
Svetoslav
7e0683b3bd Notify settings URI change without a lock held 
bug:22469552

Change-Id: Ie4a42ceef07e3a8e593fe2b1374420239242ce7b
 2015-08-03 16:06:49 -07:00
Jim Miller
3f9b9f2bbe am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev 
* commit '45fcaa547dc5b9eb2c20879b290415daa1446004':
  Don't wipe device because of short PIN, patterns or passwords
 2015-08-03 20:33:00 +00:00
Jim Miller
51e3a672e0 Don't wipe device because of short PIN, patterns or passwords 
This fixes a bug where we were counting short PIN, patterns and
passwords as attempts. For devices with a device policy admin,
this would cause devices to get wiped after a short amount of
interaction with the UI.

Fixes bug 22844609

Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
 2015-08-03 19:36:24 +00:00
Jason Monk
819df4f8fd am 66845a36: Add more dump info about emergency calls state 
* commit '66845a36c9eeca5296a2bf86793a5d6bedac1b36':
  Add more dump info about emergency calls state
 2015-08-03 15:23:17 +00:00
Jason Monk
66845a36c9 Add more dump info about emergency calls state 
Bug: 21549528
Change-Id: Idbd70e2f4b1b3285af283a28dc1933c02ad8d04c
 2015-08-03 11:09:41 -04:00
Geoff Mendal
32caf0778a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-03 14:00:37 +00:00
Geoff Mendal
02f42ca497 Import translations. DO NOT MERGE 
Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747
Auto-generated-cl: translation import
 2015-08-03 06:55:08 -07:00
Geoff Mendal
db76ee0a68 Import translations. DO NOT MERGE 
Change-Id: If7cd5e910c7761119f5185926bfe09870a68abad
Auto-generated-cl: translation import
 2015-08-03 06:55:06 -07:00
Geoff Mendal
335ffd32d2 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-01 05:14:27 +00:00
Geoff Mendal
b4672baa3e Import translations. DO NOT MERGE 
Change-Id: If10ca2d47b314ddab9e7ae7b475d55eb4ce4d519
Auto-generated-cl: translation import
 2015-07-31 20:37:35 -07:00
Geoff Mendal
2f8e387b01 Import translations. DO NOT MERGE 
Change-Id: I067b513b8b2344bd2f8ee9960ddcc5000e7173c3
Auto-generated-cl: translation import
 2015-07-31 20:34:13 -07:00
Chris Wren
ca3a3650e4 am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev 
* commit '6e75e7dd988d7704a01528f479421ab5e6012c99':
  Instrument printing service for metrics collection.
 2015-08-01 00:16:59 +00:00
Chris Wren
6e75e7dd98 Merge "Instrument printing service for metrics collection." into mnc-dev 2015-08-01 00:11:16 +00:00
Selim Cinek
e681aed17f am f92a1fdb: Fixed a bug where notifications shadows were blinking out 
* commit 'f92a1fdb77311149189ae17244adc51017b89c1e':
  Fixed a bug where notifications shadows were blinking out
 2015-07-31 23:53:33 +00:00
Selim Cinek
f92a1fdb77 Fixed a bug where notifications shadows were blinking out 
Bug: 22567770
Change-Id: I2d335241a287d0c64e659221994f19b7c13eccd3
 2015-07-31 23:24:55 +00:00
Winson Chung
c8222f40fc am c35e670d: Moving removeTask to separate thread. 
* commit 'c35e670d5386eb6388eb4e65746b950265312e7a':
  Moving removeTask to separate thread.
 2015-07-31 19:55:40 +00:00
Winson Chung
c35e670d53 Moving removeTask to separate thread. 
Bug: 22760556
Change-Id: Iac6eef77e3ba5432ac1cd4aa792e7b2aadc27c01
 2015-07-31 12:47:25 -07:00
Winson Chung
183b589fd4 am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev 
* commit '92e0c86fa2b84619ebc3acb6d91434dd17113c61':
  Ensuring that we don't try to use and propagate null activity labels.
 2015-07-31 19:43:30 +00:00
Jorim Jaggi
f1518da451 Fix fingerprint icon screen on animation 
Bug: 22807015
Change-Id: I4685085007d87f1b1e1db380d0f899efc4e56240
 2015-07-31 19:31:16 +00:00
Winson Chung
92e0c86fa2 Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev 2015-07-31 19:20:51 +00:00
Winson Chung
fce23748c4 Ensuring that we don't try to use and propagate null activity labels. 
- Also fixes issue with tapping outside bounds not working to dismiss recents

Bug: 21774486
Bug: 22241587
Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
 2015-07-31 18:51:58 +00:00
Jason Monk
3266f61230 QS: Allow Flashlight Tile to handle reset state 
Bug: 22815987
Change-Id: I3c22760c546c5407495e1e8f09dc402a56817f9d
 2015-07-31 11:37:11 -04:00
Julia Reynolds
9bc9469807 am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
  Fix SysUI crash on device boot.
 2015-07-31 13:57:02 +00:00
Julia Reynolds
8478aba1a2 Fix SysUI crash on device boot. 
Bug: 22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
 2015-07-31 09:17:20 -04:00
Jeff Sharkey
0eaadbc2a9 am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev 
* commit '5db4cc8fee8b919b5f62f222af92a4e995ca6a70':
  Handle volumes without visible paths.
 2015-07-31 01:51:37 +00:00
Jeff Sharkey
5db4cc8fee Merge "Handle volumes without visible paths." into mnc-dev 2015-07-31 01:46:45 +00:00
Jeff Sharkey
865ea7c800 Handle volumes without visible paths. 
Transient volumes like USB drives are not mounted as visible, so we
shouldn't be kicking off media scanner for them.

Bug: 22545248
Change-Id: Ic8f2d3134f1edb8b2a12e8ff283eceeeb230f48b
 2015-07-30 18:10:39 -07:00
Selim Cinek
5b5d912913 am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev 
* commit 'b9f30b26707b7e8721b1cd03ca96b5a4a4995109':
  The heads up now correctly dissapears when clicking
 2015-07-31 00:08:00 +00:00
Selim Cinek
0fccc729fd The heads up now correctly dissapears when clicking 
Bug: 22729955
Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
 2015-07-30 23:05:42 +00:00
Selim Cinek
fb2f9c0209 am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev 
* commit '20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
  Fixed a heads up crash
 2015-07-30 21:54:35 +00:00
Selim Cinek
20a5d33175 Merge "Fixed a heads up crash" into mnc-dev 2015-07-30 21:45:55 +00:00
Fyodor Kupolov
f9fdb08caa am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 
* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
  Introduced android.permission.PEERS_MAC_ADDRESS permission
 2015-07-30 20:58:29 +00:00
Fyodor Kupolov
4988378cd0 Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 2015-07-30 20:50:04 +00:00
Chris Wren
dcc34fd8a3 Instrument printing service for metrics collection. 
Bug: 22837316
Change-Id: I8bf62940f5eb495d8d7a10df958d9bc8ad76662a
 2015-07-30 16:29:20 -04:00
Jim Miller
be869b6671 am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit '30c5da9cc20cc4b9ce820963c6f58d7826f46eaa':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 04:44:20 +00:00
Jim Miller
30c5da9cc2 Don't call cancel() when fingerprint auth fails 
KeyguardUpdateMonitor should not call cancel() when fingerprint
auth fails. The life cycle will continue until an actual error
occurs or the maximum number of retries is reached.

Fixes bug 22562277

Change-Id: I36291d025de9c049cc7f7924f692c8c21349bb7b
 2015-07-30 04:31:37 +00:00
Daniel Sandler
033fe243a7 am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit 'bbe1682b1652c37b66609676e5829517279ff141':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:15:17 +00:00