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

612 Commits

Author SHA1 Message Date
Geoff Mendal
d00ee8cbef Import translations. DO NOT MERGE 
Change-Id: I7d9126585172db9101b93b106ebf44225bd10129
Auto-generated-cl: translation import
 2015-07-22 05:51:13 -07:00
Esteban Talavera
4426729628 am b8e88dc6: am 156cc70d: am d4241a86: am 0e9ffff4: am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev 
* commit 'b8e88dc690c5e6a3c81cb701d74511821e3b2705':
  Notify the profile when cloned settings are changed.
 2015-07-07 19:08:23 +00: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
a02cf96bbd am 02dd0a36: am cf831c87: am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev 
* commit '02dd0a36add4ccaf444849b5c5ccc74c4a740072':
  Add missing conditional in settings provider
 2015-06-25 20:16:20 +00: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
34c587375b am 7375fad1: am 02f604e9: am 3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 
* commit '7375fad1463ea85c762130d61aeed2eee096a6ba':
  No need to check WRITE_SETTINGS permission in ContentProvider
 2015-06-25 01:03:51 +00: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
d86de9688b am 538b27fe: am 1e989663: am 3ee0c635: Merge "System settings can be changed by system apps." into mnc-dev 
* commit '538b27fe2d0257dfbd1bfb950e9a4e917c7d1114':
  System settings can be changed by system apps.
 2015-06-23 21:30:27 +00: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
3ba2c20102 am 1b5cc81c: am cc876b26: am 6ddc34e5: Merge "Allow binary value in SettingsProvider" into mnc-dev 
* commit '1b5cc81c90a0d961680d8f3f6bb051708d68615f':
  Allow binary value in SettingsProvider
 2015-06-22 20:27:31 +00: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
ca0ff76539 am 603bf00f: am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit '603bf00fcba0e95ed42cd4b9eadd1bfc1b45b28a':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:45:09 +00: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
b96be50703 am 57cced94: am 9c5f1c33: am 421eaa78: Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev 
* commit '57cced9462224227675d732881c6f51a30cdb150':
  Fixed NPE when dumpSettings is called with a null cursor
 2015-06-11 23:10:36 +00: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
Geoff Mendal
1c82486499 Import translations. DO NOT MERGE 
Change-Id: I17f57ae7b07121c5748e69f0bd4c1e838a9373fe
Auto-generated-cl: translation import
 2015-06-08 07:12:43 -07:00
Geoff Mendal
68a7f4e4ee Import translations. DO NOT MERGE 
Change-Id: Ieb9a927ed34ff9376261ac96b77ac648b34258e1
Auto-generated-cl: translation import
 2015-06-03 10:15:23 -07:00
Svetoslav
b12280202d am d5464b9d: am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit 'd5464b9d07f6d5cf39d8173d5a026ce457dc458f':
  Use AtomicFile APIs correctly when reading.
 2015-06-01 15:47:32 +00:00
Geoff Mendal
117889ac05 Import translations. DO NOT MERGE 
Change-Id: I8e46c3c2c16b5cfa66bb696299ed32f4ff43ef26
Auto-generated-cl: translation import
 2015-05-29 17:55:54 -05: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
f8bfda1a0e am e7759cca: am 61d91058: am eff64986: Merge "Do not call out of the settings provider with a lock held" into mnc-dev 
* commit 'e7759cca2743ad04b81e44b3ad314d7b6c2417ca':
  Do not call out of the settings provider with a lock held
 2015-05-21 12:45:01 +00: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
b41aab7b5c am b8ee07d1: am e2ad30ef: am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 
* commit 'b8ee07d10c8a8494cb658c3bc3f58f404b949db6':
  Pass charset to XmlPullParser.setInput instead of null
 2015-05-14 21:23:12 +00: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
Geoff Mendal
18d9823ef4 Import translations. DO NOT MERGE 
Change-Id: Ie70f9077c3e51b08528ca37c3614b065ab44c68b
Auto-generated-cl: translation import
 2015-05-13 20:47:17 -07:00
Geoff Mendal
ddb2898e0c Import translations. DO NOT MERGE 
Change-Id: Id77a38821a3010d4ec978c489d787df9b6424fb6
Auto-generated-cl: translation import
 2015-05-13 06:42:57 -07:00
Jason Monk
9de4cc5770 am d8ee3c77: am deb356dd: am 2df11817: Merge "Add control for double tap to wake setting" into mnc-dev 
* commit 'd8ee3c770fc0619e053a5aa793938d13a354acf4':
  Add control for double tap to wake setting
 2015-05-12 15:09:36 +00:00
Jason Monk
27bbb2d0a1 Add control for double tap to wake setting 
Bug: 16875464
Change-Id: Ic1ad910dd38acbc68ef040b2acdf3696ec2c2e4e
 2015-05-12 10:12:32 -04:00
John Spurlock
f6cf58d0b5 am fba5881d: am 1593d94b: am fb9a664b: Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev 
* commit 'fba5881d1ccb2f22efb34783a482a36f1b189f93':
  Zen: Reset zen + ringer modes on upgrades to M.
 2015-05-11 21:18:59 +00:00
John Spurlock
e11ae11631 Zen: Reset zen + ringer modes on upgrades to M. 
Bug: 20886649
Change-Id: I79d0b4a31eb9d54c5e5d4cd80236fdb8340dfeb2
 2015-05-11 16:20:16 -04:00
Geoff Mendal
a6d47cc33d Import translations. DO NOT MERGE 
Change-Id: I953f5c61ff75db1c513013a2023114f5ff4d7b14
Auto-generated-cl: translation import
 2015-05-01 20:02:45 -07:00
Geoff Mendal
6db4699a62 Import translations. DO NOT MERGE 
Change-Id: I3ceb55bbf8af3bae4922724c7afb0f503f806349
Auto-generated-cl: translation import
 2015-04-29 07:50:55 -05:00
Adrian Roos
8150d2a2a1 Require explicit userId in LockPatternUtils 
Bug: 18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
 2015-04-28 11:49:00 -07:00
Svet Ganov
8de348095f DO NOT MERGE Do not clean up global/system settings on package unintalls. 
Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.

bug:20113160

Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit b128540dc741c424d4f652419686882b7a3bfa06)
 2015-04-27 17:49:35 +00:00
Geoff Mendal
f748bb3051 Import translations. DO NOT MERGE 
Change-Id: Ic375b06aab79b9b7d17754eba4dd9d182a669734
Auto-generated-cl: translation import
 2015-04-24 23:58:45 -07:00