652 Commits

Author SHA1 Message Date
Svetoslav Ganov
c47132c205 Merge "Use resolved calling user id" 2015-11-20 21:10:52 +00:00
Svetoslav
d8d25e0038 Use resolved calling user id
bug:25476216

Change-Id: I0093a5c071affaa5f3ca8eeb0e3a7a36b66a3c1f
2015-11-20 13:09:32 -08:00
Chris Tate
3d4e969f4f Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde am: b5a38f6da5
am: 96333c2e8c

* commit '96333c2e8cd13df55e8c878925f8cd2e9c90ac42':
  Don't back up / restore EAP network definitions
2015-11-20 18:15:52 +00:00
Chris Tate
96333c2e8c Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
2015-11-20 18:10:21 +00:00
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
Jeff Sharkey
f9fc6d6cc0 More file-based encryption work.
Add granular StorageManager APIs for key creation/destruction and
unlocking/locking.  Start passing through an opaque token as part
of the unlock command, but leave it empty for now.  We now have a
separate "prepare" method that sanity checks that user directories
are correctly setup.

Define a handful of system properties used for marking devices that
should be operating in FBE mode, and if they're emulating FBE.  Wire
a command to "sm", but persisting will come later.

Start using new "encryptionAware" flag on apps previously marked with
coreApp flag, which were apps running in the legacy CryptKeeper
model.  Small tweaks to handle non-encryptionAware voice interaction
services.  Switch PackageManager to consult StorageManager about the
unlocked state of a user.

Bug: 22358539
Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
2015-11-11 10:47:23 -08:00
Svetoslav
41f3c49cce Don't crash if cannot persist settings
bug:23569962

Change-Id: I19fd7d37b6de251696d119cfc33e87e9743b2029
2015-11-09 19:47:22 +00: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
Fyodor Kupolov
cd86ebf1c9 Check multi-user support in isUserSwitcherEnabled
isUserSwitcherEnabled now returns false if multi-user is disabled(
supportsMultipleUsers() returns false).

Removed GUEST_USER_ENABLED setting and replaced with DPM.getGuestUserDisabled
check. It currently always returns false, but will be replaced with an actual
policy check.

Bug: 17571233
Change-Id: I41853e8b321b2537952cac5d92e88bfdb8cbd9a8
2015-09-30 14:08:01 -07:00
Xiaohui Chen
e4de5a0d3b Cleanup OWNER references.
Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595
2015-09-23 18:50:11 +00:00
Xiaohui Chen
43765b77a0 Cleanup USER_OWNER in SettingsProvider[Test]
Fixed up the tests and re-enabled it.
Still suppressed one test because what it relies on Settings.Bookmarks
is broken because Settings query format changed.
Fixed a bug in SettingsProvider that the package query is using the
wrong user id.

Bug: 19913735
Change-Id: Ied86a261defba2706f726a13bc32f385f7d93787
2015-09-02 09:52:02 -07:00
Chris Tate
590fb3e066 am 863676ef: am d4c0b52e: am 1e05bc6f: am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '863676ef7f30080a1b88633c7c75f71f91150dbd':
  Fix wifi disable during restore
2015-08-10 23:13:33 +00: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
e00211490d am a394b3d2: am 94275813: am 117f024b: am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit 'a394b3d25f53744ef9802d421422864595d19488':
  Wait a bit longer for wifi to shut down before rewriting the config
2015-08-07 23:06:41 +00: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
774fe81a7b am fa3dd628: am 5290bf58: am db67d5b7: am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit 'fa3dd628149b78e19b93db963385eac2b62f0334':
  Notify settings URI change without a lock held
2015-08-04 01:40:55 +00: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
a91dccdf57 am bafb5130: am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
* commit 'bafb51305731fd837b12878fffabe8885239ea10':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
2015-07-29 23:51:47 +00: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
Geoff Mendal
c5b97f38e4 Import translations. DO NOT MERGE
Change-Id: I6fb425e4c8c6087dac52c32bf9d6d8d72a8831fd
Auto-generated-cl: translation import
2015-07-29 05:45:24 -07:00
Martijn Coenen
c9e15f6efe am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit '54d7c4c85ae41893d9048e9e10d33b6826d0e04f':
  Resource for setting default NFC payment component.
2015-07-29 11:08:33 +00: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
d00ee8cbef Import translations. DO NOT MERGE
Change-Id: I7d9126585172db9101b93b106ebf44225bd10129
Auto-generated-cl: translation import
2015-07-22 05:51:13 -07: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
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