Commit Graph

2408 Commits

Author SHA1 Message Date
Tyler Gunn
22a584906b Merge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:03:00 -08:00
Tyler Gunn
cc5d6dcccb Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:55:50 -08:00
Jack Yu
6714030083 merge from master
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
2015-12-10 12:27:58 -08:00
Lorenzo Colitti
bdc458048a Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am: 809dcade99

* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
2015-10-22 06:18:43 +00:00
Lorenzo Colitti
d542705066 Reinstate CHANGE_NETWORK_STATE as a normal permission.
This is a partial revert of http://ag/738523 , but not a full
revert because M apps that have gone through the WRITE_SETTINGS
route to obtain permission to change network state should
continue to have permission to do so.

Specifically:

1. Change the protection level of CHANGE_NETWORK_STATE back from
   "signature|preinstalled|appop|pre23" to "normal". This allows
   apps that declare CHANGE_NETWORK_STATE in their manifest to
   acquire it, even if they target the M SDK or above.
2. Change the ConnectivityManager permission checks so that they
   first check CHANGE_NETWORK_STATE, and then ask Settings
   if the app has the WRITE_SETTINGS runtime permission.
3. Slightly simplify the code in the Settings provider code that
   deals specifically with the ability to change network state.
4. Make the ConnectivityService permissions checks use the
   ConnectivityManager code to avoid code duplication.
5. Update the ConnectivityManager public Javadoc to list both
   CHANGE_NETWORK_STATE and WRITE_SETTINGS.

Bug: 21588539
Bug: 23597341
Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e
2015-10-22 08:33:45 +09:00
Jeff Sharkey
792a9cc3a5 am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
* commit '30fd0628970b418dea382b388120f52504ff2243':
  Relax auto-launch checks for GET_CONTENT.
2015-09-30 20:11:22 +00:00
Jeff Sharkey
cc2ae6b421 Relax auto-launch checks for GET_CONTENT.
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults.  A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.

However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app.  Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.

Bug: 24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
2015-09-29 13:04:48 -07:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:11:19 +00:00
Christopher Tate
9cecf14783 Do not back up/restore the "pulse LED for notifications" setting
Bug 24103790

Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
2015-09-15 14:26:12 -07:00
Jorim Jaggi
5a9bb9516d resolved conflicts for 5d0e02b6 to cw-e-dev
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
2015-09-09 17:49:57 -07:00
Adrian Roos
5941c98c64 Add double-tap power button to open camera 1/2
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
2015-09-09 16:57:14 -07:00
Jorim Jaggi
73ef464291 am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
  Fix documentation issue
2015-08-17 22:05:30 +00:00
Jorim Jaggi
581fd0fb2e am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue
2015-08-17 21:58:51 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
2015-08-17 18:45:22 +00:00
Wei Liu
a181770f35 Add a setting to enable cellular on boot.
b/22804423

Change-Id: Ifcee3a2a8bfbfab366c3f9dcd8926d500851bd32
2015-08-12 10:02:06 -07:00
Jason Monk
3605247746 Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:53 +00:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Billy Lau
70f998e57d Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:16:03 +00:00
Billy Lau
a7238a397d Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility

provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.

ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.

Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
2015-08-07 19:29:51 +01:00
Julia Reynolds
9b11fdb56d Store ringer mode on entering DND mode so it can be restored on exit.
Store the value in Settings now, so it's not lost on reboot.
Bug: 22338093

Change-Id: Icc843ef2bf735c23aabf9ceddd82283d51424220
2015-08-05 09:27:23 -04:00
Roshan Pius
78b8d4aa99 Mark missed calls as read in calllog restore(2/2)
When missed calls are restored by CalllogBackupAgent using the addCall
API of CallLog provider, we were setting the IS_READ flag to 0 which
resulted in user getting a missed call notifications for all missed
calls after restore.
Adding a new addCall API signature which can specify the value to be put in the
IS_READ field when a call is added to the calllog provider. This will be
used by the CallLogBackupAgent to mark all restored missed calls as
read.

BUG: 22908952
Change-Id: Iee3bea09fbdefef09c7eb6c6c61728cb4d94d9e7
2015-08-04 14:10:49 -07:00
Jason Monk
5a5e7d64bb Add setting to disable camera gesture
Bug: 22183841
Change-Id: Ibafc5b74cd5cc708e3f884a6d7b2b5c354e04d4a
2015-08-04 11:20:25 -04:00
Billy Lau
7c19f4cf20 Bug: 22879202 App compatibility with WRITE_SETTINGS failing
Fix a bug in the app ops protected permission check that broke backwards
compatibility.

Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3
2015-08-01 13:16:25 +01:00
Deepanshu Gupta
e836a229ae Fix build.
Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
2015-07-31 12:11:12 -07:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +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
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Alan Viverette
93184eef41 Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev 2015-07-29 20:46:08 +00:00
Alan Viverette
ec9bea7eeb DO NOT MERGE: Don't backup night mode setting
Bug: 22824325
Change-Id: I7a244f416e1aa258735eea09858e3c202e8c8945
2015-07-29 16:22:03 -04:00
Adrian Roos
7811d9f509 Fix and deprecate lock pattern related settings
Bug: 22557690
Change-Id: Ib4b3ef7cebe815ba9d9d2284f945a9ec746b216c
2015-07-27 19:59:27 -07:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions.
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
2015-07-24 15:16:11 -07:00
Junda Liu
859551f7c0 Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 2015-07-23 16:20:35 +00:00
Junda Liu
d5f0f4132c Remove volte_feature_disabled as carrier config handled it.
Bug: b/22602876
Change-Id: Ib1948c93eae6b563846563f1353bab24c4c687a0
2015-07-22 12:21:54 -07:00
Tingting Wang
ad359f2e70 Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 2015-07-17 18:19:56 +00:00
Nancy Chen
660322d825 Merge "Add transcription field to voicemail object and related changes." into mnc-dev 2015-07-17 16:37:43 +00:00
Nancy Chen
5bd3e73a21 Add transcription field to voicemail object and related changes.
Bug: 22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
2015-07-16 18:36:58 -07:00
Tingting Wang
86ac228143 Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
This reverts commit d55b348e62.

Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
2015-07-16 21:19:28 +00:00
Tony Mak
532737df65 Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 2015-07-16 14:50:19 +00:00
Billy Lau
22b3f4cb15 Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
2015-07-12 22:41:00 +01:00
Tingting Wang
d55b348e62 Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
2015-07-08 12:55:22 -07:00
Ian Pedowitz
937edac8e8 Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
This reverts commit d6b404c72d.

This CL seems to have broken the build, causing GMSCore to continuously
crash.

Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
2015-07-07 08:32:44 -07:00
Billy Lau
d6b404c72d Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
2015-07-07 00:27:53 +01:00
Tony Mak
faf96ebc88 Fix calendar reminder notification is not shown in idle state
Bug: 22182280

Change-Id: If1b84ffe868eb44204f26c1d6a6bc76e67281c04
2015-07-03 15:49:16 +00:00
Jeff Sharkey
e8a4b66960 Better handling of trim/benchmark results.
Request benchmarking of devices once per week during normal fstrim
maintenance window.  Tunable parameter gives us the ability to change
frequency through global setting.

Track individual benchmark and trim results for each volume, and
use scrubbed volume identifier (based on adoptiong age) when logging
stats to drop box.  Track last benchmark and trim time for each
volume separately.

Bug: 21831325
Change-Id: I53b3ed788f7820c2e5bceb2840339f5b4aada3f0
2015-07-01 15:48:34 -07:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Jorim Jaggi
a133f0b522 Add setting to disable screenshot separately (1/2)
Bug: 22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
2015-06-29 17:16:33 -07:00
Billy Lau
cbe540f946 Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle
to be manually enabled in Settings.

Raised the protection level of SYSTEM_ALERT_WINDOW from dangerous to
system|signature|appop. Added a new API in Settings for developers to invoke
the main configuration setting. Also added a new metrics in MetricsLogger.
Finally, also made changes to PhoneWindowManager to check the permission to draw
overlay properly.

Change-Id: I4a073e6f038b8b8d2fa5bd6ad60abda496be9701
2015-06-26 16:59:41 +01:00
Svetoslav
7008b51817 Prevent certain actions of app has revoked permissions
bug:21808294

Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
2015-06-25 10:55:11 -07:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions.
This reverts commit ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00