Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76ed3daa authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am d3364600: Merge into jb-mr1-dev 

* commit 'd3364600':
  fix argument parser for global settings URLs
parents ddaa5d73 d3364600

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ public class SettingsProvider extends ContentProvider { 
                if (!DatabaseHelper.isValidTable(this.table)) {

                    throw new IllegalArgumentException("Bad root path: " + this.table);

                }

                if (TABLE_SYSTEM.equals(this.table) || TABLE_SECURE.equals(this.table)) {

                if (TABLE_SYSTEM.equals(this.table) || TABLE_SECURE.equals(this.table) ||

                    TABLE_GLOBAL.equals(this.table)) {

                    this.where = Settings.NameValueTable.NAME + "=?";

                    this.args = new String[] { url.getPathSegments().get(1) };

                } else {