packages-apps-Settings

Fork

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczuIACgkQ6K0/gZqxDnim9wCfU69t/uqtK/g44Tolchk7psO9
Df0An3VmPR/vBg1+fDfzxAt+mPfXyfBr
=acAG
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into marshmallow-x86

Android 6.0.1 release 74

[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
(cherry picked from commit c94f2b93afa2db9d87f9d8e0dc0c8709f16a326d)

Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfO7lwACgkQ6K0/gZqxDnjvhACggvcfyT1fT9PgMKiHjd+AblDO
kX0An1H5AteZnfS25Y2lvJiqvOkpGknd
=l3yi
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into marshmallow-x86

Android 6.0.1 release 66

Pre-setup restrictions DO NOT MERGE

- Prevent external tiles from system apps
- Don't let user settings run
- Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b

Settings: Add Superuser entry

Squashed commit of the following:

Author: Koushik Dutta <koushd@gmail.com>
Switch to new Superuser
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Author: Danny Baumann <dannybaumann@web.de>
Hide Superuser entry if root access for apps is disabled.
Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e

Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Development: Root for apps is unavailable if the su daemon isn't running

The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.
Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Add preference for enabling root access (3/3)

* Root over ADB is now disabled by default on non-eng builds
* Requires support in su binary and adbd
* Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java

Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.

Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff

DevSettings: Fix the root-access toggle in eng builds

It was being unconditionally removed, put it back

Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47

Add an option to control native bridge

Create an EGL context for DeviceInfoSettings

In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.

Add information about OpenGL driver version

Change-Id: Icf107642b6d84a85c90c7411d6e42e9b6c6ef739
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>

Added Manufacturer to device info

Added an item to display manufacturer in device info page.

For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>

DO NOT MERGE Modify system settings: incorrect UI state

The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit 119d589ea5aa9c2ccc5164279d718a20d0865f20)

Preserve FRP lock if wiped during SUW

Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24

Uncheck checkbox for contact sharing by default for non carkit devices.

+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76

Block developer settings during SUW

Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.

Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419

Null check queryIntentServices

Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3

Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS

Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).

Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130

Fix issue #25371736: Don't include z-ram allocations in Android OS

Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.

Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686

Import translations. DO NOT MERGE

Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import

Fix crash in Settings from uninstall

Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e

Import translations. DO NOT MERGE

Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import

Allow access to permissions, even if app has none

Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb

Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev

Merge "Hide empty data usage cycles." into mnc-dr-dev

Merge "Clamp large data usage values." into mnc-dr-dev

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c

Hide empty data usage cycles.

When building list of historical data usage cycles, omit cycles
that don't contain any data usage. A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between. Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3

Hide SIM and IMEI for wifi only devices

Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392

Clamp large data usage values.

Without clamping, they can wrap around to negative values and cause
all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps
for a solid month.

Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev