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

17471 Commits

Author SHA1 Message Date
Mitchell Wills
088c8de233 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:30:36 +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
a950fe0ab3 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
 2015-08-05 22:51:43 +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
Jason Monk
26085a0aac 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:51:00 +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
7fdd006d2a 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 03:10:33 +00:00
Svetoslav Ganov
b2972dbd75 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 03:09:50 +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
cd1e7f7b94 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:35:13 +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
93053a8e19 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:19 +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
Chris Wren
6fe9424837 am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev 
* commit '6e75e7dd988d7704a01528f479421ab5e6012c99':
  Instrument printing service for metrics collection.
 2015-08-01 00:18:31 +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
54f9a21a44 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:49:14 +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
7a8f112c4c am c35e670d: Moving removeTask to separate thread. 
* commit 'c35e670d5386eb6388eb4e65746b950265312e7a':
  Moving removeTask to separate thread.
 2015-07-31 19:59:01 +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
e335de6177 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:31:22 +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
77978934c7 am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
  Fix SysUI crash on device boot.
 2015-07-31 13:56:56 +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
1ff0d50cd8 am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev 
* commit '5db4cc8fee8b919b5f62f222af92a4e995ca6a70':
  Handle volumes without visible paths.
 2015-07-31 01:51:29 +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
c0d9c0c13e 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:06:10 +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
758a28d4a1 am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev 
* commit '20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
  Fixed a heads up crash
 2015-07-30 21:54:39 +00:00
Selim Cinek
20a5d33175 Merge "Fixed a heads up crash" into mnc-dev 2015-07-30 21:45:55 +00:00
Fyodor Kupolov
123a9f93ad 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:37 +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
0c152b9e84 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:46 +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
b10d22ff93 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:12:32 +00:00
Daniel Sandler
bbe1682b16 Merge changes from topic 'fix-media-notifications' into mnc-dev 
* changes:
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 02:57:06 +00:00
Selim Cinek
acd0df65dd Fixed a heads up crash 
Some references to notifications were still
kept around while timing out, leading to small
leaks and sometimes crashes.

Bug: 22819475
Change-Id: I1429b5669366521c6374efbcae6c26d6e407d8cc
 2015-07-29 19:09:03 -07:00
Jason Monk
710091b125 am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit 'beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0':
  Fix touch target for settings icon
 2015-07-30 00:36:14 +00:00
Jorim Jaggi
e987d6099b am 26aa04c3: Fix state weirdness in the panel 
* commit '26aa04c3c4d16ab7bf47d414fac697721e5843cd':
  Fix state weirdness in the panel
 2015-07-30 00:36:08 +00:00
Jason Monk
beb3185f01 Merge "Fix touch target for settings icon" into mnc-dev 2015-07-30 00:32:17 +00:00
Jorim Jaggi
26aa04c3c4 Fix state weirdness in the panel 
When QS was open while the we started with expansion, we
immediately notified about expansion finsihed again, which led to all
kinds of weird states. The change that introduced these bugs was to
fix another bug in which onExpandingFinished was not call. Make sure
to call in exactly that case and no other case to not risk
regressions.

Bug: 22806817
Bug: 22807359
Bug: 22807372
Change-Id: Id7daf37ef4a772f724971bf79c61084ff4279f31
 2015-07-30 00:22:14 +00:00
Billy Lau
77bb814318 am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit 'a6706627a9bf749cc591605272810e03983a9eea':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 22:47:18 +00:00
Billy Lau
a6706627a9 Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 2015-07-29 22:42:27 +00:00
Dan Sandler
b4c12fdb52 am 25ffc7ad: Accessibility: Read the time correctly in quick settings. 
* commit '25ffc7ad950d9b2857abe9cb66ed53aed7a18ecf':
  Accessibility: Read the time correctly in quick settings.
 2015-07-29 22:32:44 +00:00
Billy Lau
6ad2d66072 Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check 
changes)

AppOpsManager:
Changed the default operating mode for WRITE_SETTINGS to MODE_DEFAULT from
MODE_ALLOWED.

packages/SettingsProvider:
We no longer do static permission checks for WRITE_SETTINGS in early checks and
defer that to app op when MODE_DEFAULT is returned. For some operations,
checking against WRITE_SECURE_SETTINGS is sufficient.

ActivityManagerService & PowerManagerService:
Incorporated app op checks and handled the MODE_DEFAULT case.

provider/Settings:
Added helper function to do checks on whether app ops protected operations
can be performed by a caller. This includes checks for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW.
Also added a public API (with javadocs) for apps to query if they can modify
system settings.
Changed the javadocs description for ACTION_MANAGE_WRITE_SETTINGS and
ACTION_MANAGE_OVERLAY_PERMISSION.
Added public API (with javadocs) for apps to query whether they can draw overlays or not,
and also javadocs description on how to use that check.

Change-Id: I7b651fe8af836c2074defdbd6acfec3f32acdbe9
 2015-07-29 23:21:26 +01:00