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

619 Commits

Author SHA1 Message Date
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions" 
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
 2015-11-20 18:05:04 +00:00
Christopher Tate
9bc2f472e9 Don't back up / restore EAP network definitions 
Bug 25725016

Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
 2015-11-18 13:42:04 -08:00
Baligh Uddin
185269d3e9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
 2015-11-04 11:56:04 -08: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
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
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
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
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
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
Svetoslav Ganov
5290bf5875 am db67d5b7: am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev 
* commit 'db67d5b79ab2da6d8b8a1211b354687fb7930744':
  Notify settings URI change without a lock held
 2015-08-04 01:17:54 +00:00
Svetoslav Ganov
db67d5b79a am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev 
* commit 'ba6cdbfdbbbb6f83052e895a698fcc0d71793b25':
  Notify settings URI change without a lock held
 2015-08-04 01:09:07 +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
Svetoslav
7e0683b3bd Notify settings URI change without a lock held 
bug:22469552

Change-Id: Ie4a42ceef07e3a8e593fe2b1374420239242ce7b
 2015-08-03 16:06:49 -07:00
Billy Lau
ee2ee0f92d am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit 'be6bfb4c910e02d7e18b732d7f9cf09d5b3e94a7':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 23:17:55 +00:00
Billy Lau
be6bfb4c91 am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit '83749ac948c40a3c302f00bef47ef0b4bba96ae7':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 23:02:05 +00:00
Billy Lau
83749ac948 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:46:20 +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
Geoff Mendal
c8250e009a Import translations. DO NOT MERGE 
Change-Id: Ie86135b25283948fc05f3e0d412c43546e2a743b
Auto-generated-cl: translation import
 2015-07-29 06:47:22 -07:00
Martijn Coenen
619b37a361 am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'ef3614ebb9089936ba32772f89c14466d77ba777':
  Resource for setting default NFC payment component.
 2015-07-29 10:27:41 +00:00
Martijn Coenen
ef3614ebb9 am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'c16fd06ae462f79d3f13eb5e29db3227c0e64985':
  Resource for setting default NFC payment component.
 2015-07-29 10:06:14 +00:00
Martijn Coenen
50184147fc Merge "Resource for setting default NFC payment component." into mnc-dev 2015-07-29 07:54:29 +00:00
Martijn Coenen
7ab4b7fd50 Resource for setting default NFC payment component. 
Bug: 22756856
Change-Id: If97e0faead995fb95893a128c1890b61bbe86ce5
 2015-07-27 16:04:31 +02:00
Geoff Mendal
facfbc52d8 Import translations. DO NOT MERGE 
Change-Id: I54d30125585b48fa3d419a991802ce6152b9cbcd
Auto-generated-cl: translation import
 2015-07-15 11:30:20 -05:00
Esteban Talavera
156cc70db9 am d4241a86: am 0e9ffff4: am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev 
* commit 'd4241a86a28459ee82074c177a147f92385310da':
  Notify the profile when cloned settings are changed.
 2015-07-07 16:21:43 +00:00
Nicolas Prevot
310e1eeb35 Notify the profile when cloned settings are changed. 
In SettingsProvider, for settings that are cloned from the parent
to the profile:
When the parent value is changed, notify ContentObservers in the
profile as well.

BUG:21414456
Change-Id: Ie0560d1332174499d067db9978553843b640a161
 2015-07-03 13:13:46 +01:00
Svetoslav
cf831c8786 am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev 
* commit 'f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c':
  Add missing conditional in settings provider
 2015-06-25 19:03:42 +00:00
Svetoslav
f9c6dbb6d1 Merge "Add missing conditional in settings provider" into mnc-dev 2015-06-25 18:53:59 +00:00
Svetoslav
45146493c6 Add missing conditional in settings provider 
Change-Id: I717e8b87eccbedf1a1abead77e7856a2aa2405fa
 2015-06-25 11:53:02 -07:00
Amith Yamasani
02f604e942 am 3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 
* commit '3704da0d9e45605e0ff38408a30de38b672ff83e':
  No need to check WRITE_SETTINGS permission in ContentProvider
 2015-06-25 00:38:09 +00:00
Amith Yamasani
3704da0d9e Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 2015-06-25 00:24:19 +00:00
Amith Yamasani
9a660991ed No need to check WRITE_SETTINGS permission in ContentProvider 
Permission checks are enforced within the SettingsProvider specifically
for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't
apply to all the settings types.

Bug: 22044704
Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
 2015-06-24 15:46:09 -07:00
Svetoslav
1e989663bc am 3ee0c635: Merge "System settings can be changed by system apps." into mnc-dev 
* commit '3ee0c635698d36f660ebb6dd139192f36a22c0dc':
  System settings can be changed by system apps.
 2015-06-23 19:26:22 +00:00
Svetoslav
f41334bb15 System settings can be changed by system apps. 
The system settings permission is going away and the user will
be able to choose which apps have access to system settings in
the UI. So, if an app is white-listed by the user or being on
the system image, we allow access to system settings. Also if
the caller has the stronger write secure settings permission
we allow changes of the less sensitive system settings.

Change-Id: I7aca958fd0ad2c588117b8c6e44d78eb16d648bc
 2015-06-23 12:10:30 -07:00
Makoto Onuki
cc876b2692 am 6ddc34e5: Merge "Allow binary value in SettingsProvider" into mnc-dev 
* commit '6ddc34e578a707929438df3570baa684a36bafbd':
  Allow binary value in SettingsProvider
 2015-06-22 20:02:15 +00:00
Makoto Onuki
3a2c3578ba Allow binary value in SettingsProvider 
Now a text value will be written to "value" but a binary value will be encoded
in base64 and stored in "valueBase64".

A null value will have neither value nor valueBase64.

Bug 20202004

Change-Id: I1eae936ff38e3460dc76ca20cc38f8d7e5ec6215
 2015-06-22 11:16:14 -07:00
Junda Liu
25acdffa23 am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:18:50 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Junda Liu
297da6ffb9 Remove hide_carrier_network_settings from Settings. 
No longer needs this as carrier config manager handles it now.

Bug: b/21347654
Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
 2015-06-15 15:29:08 -07:00
Fyodor Kupolov
9c5f1c334b am 421eaa78: Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev 
* commit '421eaa7813e33ea1bbce398e5940e6ab477c759d':
  Fixed NPE when dumpSettings is called with a null cursor
 2015-06-11 22:41:34 +00:00
Fyodor Kupolov
1f450dbfbc Fixed NPE when dumpSettings is called with a null cursor 
Bug: 20070414
Change-Id: I15d5d2ae27a7892807221421778082e0f29a36ff
 2015-06-11 15:25:59 -07:00
Svetoslav
80c2cc14e1 am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit '815be147a35452d52feb0610ff11d8645351ad9f':
  Use AtomicFile APIs correctly when reading.
 2015-05-29 20:51:58 +00:00
Svetoslav
815be147a3 Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 2015-05-29 20:05:43 +00:00
Svetoslav
3dcdd37b66 Use AtomicFile APIs correctly when reading. 
21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
 2015-05-29 13:01:37 -07:00
Geoff Mendal
642c4fc527 Import translations. DO NOT MERGE 
Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import
 2015-05-29 09:10:35 -05:00
Svetoslav
61d910583d am eff64986: Merge "Do not call out of the settings provider with a lock held" into mnc-dev 
* commit 'eff649862be8db389cf8480efa50ca1106dd2117':
  Do not call out of the settings provider with a lock held
 2015-05-21 00:45:41 +00:00
Svetoslav
7ec28e8513 Do not call out of the settings provider with a lock held 
bug:20443441

Change-Id: I704520b75f5deaeeb1b4098cda0783c667e8cdd1
 2015-05-20 17:24:13 -07:00
Wojciech Staszkiewicz
e2ad30ef51 am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 
* commit 'be752b1f28f1f3724b235e3f0a77b4c07c40e631':
  Pass charset to XmlPullParser.setInput instead of null
 2015-05-14 10:34:55 +00:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null 
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
 2015-05-14 10:24:34 +01:00