473 Commits

Author SHA1 Message Date
Kenny Guy
7322d0e60e am 2483cf54: am 88b01d88: am 27cee100: am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
* commit '2483cf54ac6f140a62af6b9222a420298ed83234':
  SettingsProvider should use correct cache when redirecting to user 0.
2014-10-02 19:50:37 +00:00
Kenny Guy
2483cf54ac am 88b01d88: am 27cee100: am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
* commit '88b01d88a2f343256a426280297e9587bfebff87':
  SettingsProvider should use correct cache when redirecting to user 0.
2014-10-02 19:43:45 +00:00
Kenny Guy
bdcfc01b3b am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
2014-10-02 16:55:35 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Dianne Hackborn
7c56fd3c25 am 7cf6cac5: am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '7cf6cac507df68ecb1d6484a5287687e4df61573':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 13:46:39 +00:00
Erik Pasternak
fcdd687092 am c7cbbe8e: am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit 'c7cbbe8e82b2dda4889a6663a83586f1e6759282':
  Implement auto-sleep functionality.
2014-10-02 13:46:34 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
2014-10-02 13:38:16 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
2014-10-02 00:04:01 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
2014-10-01 16:58:56 -07:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
2014-10-01 15:01:10 -07:00
Kenny Guy
a37d000c2b SettingsProvider should use correct cache when redirecting to user 0.
SettingsProvider reads secure and system settings for managed
profiles from user 0 instead. However it still checks the cache
for the managed profile not user 0.

Bug: 17736586
Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
2014-10-01 19:18:18 +01:00
Amith Yamasani
86f0a242b9 am cc4d4562: am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit 'cc4d4562b88f4467b76b8598c1f4e51a2e3d1266':
  Return masked location mode for managed profiles
2014-09-24 23:03:22 +00:00
Amith Yamasani
6ea243e87e am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit 'bc1ec524ec5b91864547fb06af2132145b296c0a':
  Return masked location mode for managed profiles
2014-09-24 22:54:33 +00:00
Amith Yamasani
b1920e2d1c am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
  Return masked location mode for managed profiles
2014-09-24 21:34:44 +00:00
Amith Yamasani
ccc7cb9bdb Return masked location mode for managed profiles
If there's a user restriction on location sharing in a
managed profile, always return empty string for location
providers so that location can be disabled by the admin
even if the primary user has location enabled.

Also fix an incorrect update of the cache. Shouldn't update
the primary user's cache when the caller is the managed profile.

Bug: 17478855
Change-Id: Icab3459ae351c5cfc287e21df6a5ba1df9dfbdb4
2014-09-24 12:11:04 -07:00
Baligh Uddin
63649e4666 Import translations. DO NOT MERGE
Change-Id: I3747af453da6584d90fd2f91ace4ea7d9cff1e60
Auto-generated-cl: translation import
2014-09-20 23:16:23 -07:00
Baligh Uddin
f0e65a3298 Import translations. DO NOT MERGE
Change-Id: I4e30e9bfaa1032d9e2cd8ca170945b4c4f16d597
Auto-generated-cl: translation import
2014-09-20 23:13:04 -07:00
Baligh Uddin
b1b8fa00de Import translations. DO NOT MERGE
Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7
Auto-generated-cl: translation import
2014-09-20 23:10:32 -07:00
Christopher Tate
46380962f3 am 1f2e31ef: am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
* commit '1f2e31efb8ce78f99c86f7847b7498e23937d2ff':
  Always give wifi a chance to quiet down during restore
2014-09-20 02:17:32 +00:00
Christopher Tate
688c88e0d2 am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
* commit 'ebff637b894a60a20e62b12089c29779cc6f9e98':
  Always give wifi a chance to quiet down during restore
2014-09-20 00:45:09 +00:00
Christopher Tate
604de34956 am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
* commit 'c9a016dd4eefd01ab6acc916d2a1bad854933e58':
  Always give wifi a chance to quiet down during restore
2014-09-20 00:33:14 +00:00
Christopher Tate
4c45b649c3 Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 2014-09-20 00:25:12 +00:00
Christopher Tate
7274444b6e Always give wifi a chance to quiet down during restore
Not just when the current scan-always setting is on.

Bug 17571997

Change-Id: Idc56c9682c18f5e23c0bde98736522a79583af5e
2014-09-19 17:03:59 -07:00
Baligh Uddin
06879f708d Import translations. DO NOT MERGE
Change-Id: If2f0a601fa0fd3f35f3498510a27e9719ce2c661
Auto-generated-cl: translation import
2014-09-16 20:40:20 -07:00
Baligh Uddin
ecfeb0a1dd Import translations. DO NOT MERGE
Change-Id: Ia765d51a6deaec56fac570e3f887bdf298825744
Auto-generated-cl: translation import
2014-09-16 20:37:06 -07:00
Baligh Uddin
4e3cffca11 Import translations. DO NOT MERGE
Change-Id: Iea95517012e1ac1c31a11f63c34f9f431118d2f3
Auto-generated-cl: translation import
2014-09-16 20:36:18 -07:00
Baligh Uddin
e1a27ed1a9 Import translations. DO NOT MERGE
Change-Id: I52d4c3489b8135587f47a3020a77fdd6c9f7fde4
Auto-generated-cl: translation import
2014-09-14 22:54:07 -07:00
Jeff Sharkey
ad59c43072 Fix boot loop when deriving device name.
Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
2014-09-12 15:56:30 -07:00
Jerome Poichet
3d68c10854 Merge "Update default device name to MODEL only" into lmp-dev 2014-09-12 20:33:46 +00:00
Jerome Poichet
550021ec5a Update default device name to MODEL only
b/17428259 | Change device name to default to model name

Change-Id: If9f0a30f2362574d32fc69c0880c01ec7a3edb9f
2014-09-11 11:59:45 -07:00
Zoltan Szatmary-Ban
3534935273 Leave SettingsProvider running if cloning of a setting fails
Cloning of settings to managed profiles could fail due to security restrictions. This caused
Settings app crash. Instead the exception is now caught inside SettingsProvider, logged,
and we leave the app running.

Bug:17450158
Change-Id: I7525d634e57701db304117f4b2035faf53977836
2014-09-11 11:28:20 +01:00
John Spurlock
7d424b6c50 On db upgrade, reset ringer mode to normal.
When users upgrade to L, don't restore into a state that would force
zen mode to follow suit.  A user's first encounter with zen mode
should be via the UI.

Bug:16826161
Change-Id: I4eb63dce37d88f3a91b5034b3393eed2b768562c
2014-09-09 17:05:54 -04:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2)
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
2014-09-02 08:39:35 -07:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade.
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
2014-08-29 20:49:36 +00:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04:00
Nicolas Prevot
114e8994a8 Marking the Settings ContentProvider as singleUser
There is only one instance of the Settings ContentProvider, running in the user 0.
So it should be marked as singleUser.

BUG: 17133716
Change-Id: I426667ddbc8e682e7ea81f04633c0ad4f42782cb
2014-08-22 12:12:29 +01:00
Jeff Brown
49cb613c99 Reset auto-brightness setting to default.
Reset the auto-brightness setting to default since the behavior
of the feature is now quite different and is being presented to
the user in a new way as "adaptive brightness".

Bug: 17114082
Change-Id: Ica63f4caaaf50ad95dc9df88bb376f79782976f7
2014-08-20 14:45:38 -07:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
Amith Yamasani
4f7e2e334e Copy certain settings to the managed profile
All reads of those specific settings will go to the primary user.
Inserts to primary also go to managed profiles in order to notify
any observers.

This enables Location settings to be shared by both profiles.
Also some other settings related to IME and Accessibility since
those services are shared across the profiles.

Bug: 16457210
Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
2014-08-15 13:42:21 -07:00
Dan Sandler
52e5701eea Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
2014-08-06 18:00:53 +00:00
Narayan Kamath
11bfc2261f Don't assume languages are 2 letter codes.
Also, note that this method never worked. Locale
settings were stored with underscores (like Locale.toString)
but matched against AssetManager.getLocales() which
returned language-tag like output.

bug: 10090157

(cherry picked from commit fd138cd81a689ff46e6ae90e46adcdc53f3c5442)

Change-Id: Ifc81ac902c297387dba8c40aba0656e18af57c86
2014-08-01 13:32:12 +01:00
Baligh Uddin
50af6d7ae6 Remove deprecated locales - DO NOT MERGE
Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
2014-07-19 13:05:12 -07:00
Julia Reynolds
25838509d8 INSTALL_NON_MARKET_APPS lives in Secure again.
Change-Id: Ib3c7a48b8dc2d649f2f6c8e8cd822ab342634afd
2014-07-10 12:29:40 -04:00
Julia Reynolds
5e458dd6b4 Apply user restrictions to SettingsProvider.
Change-Id: If68c715bc688bf0df63591e0b8f8bf8a2b6dd118
2014-07-07 20:09:23 +00:00
Baligh Uddin
442dbe962e Import translations. DO NOT MERGE
Change-Id: I05f000d23e0e1e8d32c1d00e024c8d67b0a684f8
Auto-generated-cl: translation import
2014-07-06 04:48:17 -07:00
Baligh Uddin
76dc35cfe7 Import translations. DO NOT MERGE
Change-Id: I0744341c6988f5b93105aab2a2a5830983578a65
Auto-generated-cl: translation import
2014-06-30 14:44:21 +00:00