History log of /packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
93f24e3f6f266ce4628e82617320a2439a317222 15-Aug-2017 Suprabh Shukla <suprabh@google.com> Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
(cherry picked from commit 8e08a9bb715ff6a6b6bfa9556c3666a10f87053a)
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
d141856586ce866805d7e644b246a7a96aa03d31 14-Apr-2016 Makoto Onuki <omakoto@google.com> Don't allow removing admin to be added again

Bug 27909181

Change-Id: I15bcff0f790e8f701bacea912c1624be926a2076
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
91f287908b78c328e8a45f2b7bcf8f395680d59f 13-Apr-2016 Sudheer Shanka <sudheersai@google.com> Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev
17cbc996ce81f3aee4dc897aa5aabe1bd66539aa 12-Apr-2016 Sudheer Shanka <sudheersai@google.com> Avoid showing DeviceAdminAdd screen in the background of support dialog.

Change-Id: Idb2f98012fc161decef579c1e87cca0f8ade2619
Fixes: 27665715
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
4f0c7d3636f1f8b9deb1aca94efa9513ef312aec 12-Apr-2016 Sudheer Shanka <sudheersai@google.com> Update usage of DPM.getLongSupportMessageForUser.

Bug: 27531295
Change-Id: Idc985e2c3ee0b243812053318b7ad655ea334706
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
a31c72511a855a7a50a7f370ca757ab75a7250a6 11-Feb-2016 Makoto Onuki <omakoto@google.com> Use DPM.uninstallPackageWithActiveAdmins()

... so that uninstall won't fail even if the package has
other active admins.

It's pretty much an edge case, so we don't show the
deactivation confirmation in this case.

Bug 27107878

Change-Id: I7e8b0843ac6e39e3db3bfc643eed6940e8577417
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
02a06eff4269e8b7958a5719a3733147086f8424 27-Jan-2016 Suprabh Shukla <suprabh@google.com> Adding an easy uninstall for active device admin

Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.

Bug: b/22359208

cherry pick of I8b955305927751185a4c982dadb5b1b6b07efe5e

Change-Id: Ib2ab0e35b74fc8dba7168174b2bc8fd383fe94fe
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
c548848fba59ee832e11882b583c13eea909c130 23-Jan-2016 Makoto Onuki <omakoto@google.com> Add "Uninstall" button to device admin activation dialog.

Bug 25392386

Change-Id: I91259ddd69bc61a7dd23a2e8b4d08719bc5cacca
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
7a3555961d9827ead97da293ef1e84a2c1d827d5 22-Dec-2015 Kenny Guy <kennyguy@google.com> Add support messages to device admin pages.

Add support message to device admin settings pages.
Show policy information for device owners
and profile owners.
Allow a user to remove profile from profile owners
admin page.

Bug: 26416662
Change-Id: I95424da50067b7c0ba1618a083a31448d406188f
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
c7f02876cd74151178b7e15b69bf3f757ffa3e37 02-Dec-2015 Svet Ganov <svetoslavganov@google.com> Add optional permission review for legacy apps - settings

Change-Id: I80058d093abf5d131cf7befba2eec5239ff854eb
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
f9ee84dba4299962742befdd4d390436d82b3c49 21-Oct-2015 Xiaohui Chen <xiaohuic@google.com> Clean up UserHandle.isOwner() in settings

Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
39b467482d1bf256a111c757e9b7621c6f523271 10-Sep-2015 Jason Monk <jmonk@google.com> Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
1f432586b36c93f0d82a79cd4450520345fc0135 19-Sep-2015 Fyodor Kupolov <fkupolov@google.com> Moved restricted profile setup logic to UserManagerService

Bug: 24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
fbd126e4232cfa14395a90951ecb3bd1bcd27c3a 26-Sep-2015 Bart Sears <bsears@google.com> Revert "Moved restricted profile setup logic to UserManagerService"

This reverts commit 151dffcd649329741d6b49f17dea4598a2ba30ec.

Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
151dffcd649329741d6b49f17dea4598a2ba30ec 19-Sep-2015 Fyodor Kupolov <fkupolov@google.com> Moved restricted profile setup logic to UserManagerService

Bug: 24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
1c8600b0c8f63bcb373202109c4b8c3465858132 29-May-2015 Fyodor Kupolov <fkupolov@google.com> Hide the collapse/expand icon if text fits the screen

Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.

Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
7dc56bd2cfb639eb7fd09f98dde19ddf49ced686 24-Feb-2015 Fyodor Kupolov <fkupolov@google.com> Allow alternative policy description for secondary users

For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: I0907ffb973eae247707380af1be9894ca403010f
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
dc333212bdab6d9da7f3dc7bd813350d06179c5c 23-Jan-2015 Stephan Huber <huber.stephan.sit@gmail.com> set tapjacking protection for deviceadmin permission dialog

Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com>

Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
080f8db85c62672344375ca70c53086b891bce52 13-Aug-2014 Amith Yamasani <yamasani@google.com> Make sure profile owner is system app

For cases where an app wants to become the profile owner after
setup has completed, make sure that it is a system app.

Bug: 17004847
Change-Id: I88249f1ce3bf841ca4d87f33acfd07a7db906332
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
b8e0f608cf28f20b95b65a4f7c0b345298d98e41 29-Jul-2014 Amith Yamasani <yamasani@google.com> Implement SET_PROFILE_OWNER intent

This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.

Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.

Also, make sure that profile owners cannot be deactivated.

Bug: 16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
b763e34210e3947b46ef7c9bf396579f17ab0daf 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Improve protection against malicious admins.

- 2 second timeout until we give up on displaying a message,
keeping us within the 5 second activity launch block time.
- Restart the activity launch block when we show the dialog.
- Use app ops to prevent the app of the currently displayed
admin from putting windows on top while the settings screen
is running.

Change-Id: I631e8896ec7539c2de3ff36f183e67e36bcc37ca
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
64e676a5863dc928546d047fe2e504cd54d3f835 23-Nov-2013 William Luh <williamluh@google.com> Add event logging for device admin.

This allows us to gather metrics about unwanted device admin apps. User consent from Verify Apps is required.

Bug: 11253927
Change-Id: I449929772f63f426426f7726d3d21e7c1512e6ce
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
681b21f3e4ef0a63d982eca0e9d1896422bc30ff 07-Jun-2013 Alex Klyubin <klyubin@google.com> resolved conflicts for merge of 5d21820a to jb-mr2-dev

Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
29de9d5153075b33717ba18a0c13c84ea4ba34f3 06-Jun-2013 Alex Klyubin <klyubin@google.com> Permit deactivation of malformed Device Admins.

Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
d60861258169083f3174734af821fc8078ec5d2f 22-May-2013 Dianne Hackborn <hackbod@google.com> Fix issue #9074296: Device Admins can activate in a way...

...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

(cherry picked from commit 8274b6770219a469ab8a5254206d0d81bd5c96d3)

Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.

Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
8274b6770219a469ab8a5254206d0d81bd5c96d3 22-May-2013 Dianne Hackborn <hackbod@google.com> Fix issue #9074296: Device Admins can activate in a way...

...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
4f25e1d5e3f94b761345a3286bf9c91a4df20f75 03-Mar-2011 Dianne Hackborn <hackbod@google.com> Fix issue #3324032: It is possible to create an app that cannot...

...be uninstalled using device policy managers

Don't allow app switches while we are bringing up the confirmation
dialog. This prevents the app from pushing us out of the intended
settings app flow.

Change-Id: Iea1ff64c054452d307f91f349a815c0b244e9af5
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
a1d01841664131eca201acfaf747f1f187de10f6 25-Jan-2011 Amith Yamasani <yamasani@google.com> Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.

Bug: 3376986

Convert the DeviceAdminSettings screen to a fragment, remove fat titlebar.
Convert the DeviceAdminAdd screen to layout nicely in the new holo DialogWhenLarge
style.

Change-Id: I20a9d16aed135a2178969dfff807075b0b79237c
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
c090feb64f674d9840993736a24f9667f8b0e0d5 08-Dec-2010 Jake Hamby <jhamby@google.com> Implement BT settings functionality for new UI.

- Removed context menu logic for long press (no longer used).
- Converted device picker to run in its own Activity, using a dialog
theme on large screen devices and full-screen on phones.
- Removed unused resources.
- Add device to "Paired devices" list when pairing is initiated by the
remote device.
- Return to Bluetooth settings pane after successfully pairing a new
device from the "Find nearby device" pane.
- Add support for renaming devices (TODO: persist the custom name and
update the "bread crumb" in the action bar to the new device name).
- Add support for incoming file transfer and auto connect checkboxes
in DeviceProfilesSettings.
- Show available and connected device profiles as icons instead of
summary text. Available but disconnected profiles are drawn in gray.
- Fixed bluetooth_notif_message to include the device name as a parameter
instead of appending the name to the end of the localized string.
- Changed some fields from private to package scope for more efficient
access from inner classes.

Bug: 3137982

Change-Id: Ic2d6ee5be60c9c5b3f3a8a58846d58efedfa5c93
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
5cc0e4152b3c75b41c0116c167e2bb5d8d1053cf 09-Dec-2010 Andy Stadler <stadler@google.com> Allow Device Admins to refresh (re-request) activation

* ACTION_ADD_DEVICE_ADMIN now works on already-added admins

Bug: 3253179
Change-Id: I2090339c1fb61295e728bc61ca977ff6028a68dd
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
51794a05ad044ad87efd8291b8decb71a9b5455e 14-Sep-2010 Chris Palmer <palmer@google.com> Improve the add-device-admin layout.

Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.

Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
39e64e76c14f6ad0a844cea6c9ea9865f0b9261e 26-Mar-2010 Dianne Hackborn <hackbod@google.com> API council: don't allow admin add from new task.

Change-Id: I45f75f8e2c43ba0dae51d37e104d18d0b1a2cdbf
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
97de6bccfe81655a16feb988da1d208f95a8d6e3 04-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2477264: "Force Stop" in "Manage Applications" is not working

Also add cancel button when adding a device admin.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
4037c7f27c849a1ada0980ad881636fc940a0b85 27-Feb-2010 Dianne Hackborn <hackbod@google.com> Move DeviceAdmin APIs to android.app.admin.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
3e04288198bc9bf8f97b9f30e0dbcd9bbb27d837 22-Feb-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2396296: An admin is already set
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
5435511ee9151dbca8ad13656b3dc20ec79f940b 17-Feb-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2420412: API review: DeviceAdmin API changes
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
4df6edb1acefcd927932b7c1cb71575298d53b86 05-Feb-2010 Andrew Stadler <stadler@android.com> Fix device administrator "add" logic

Due to a missing "else" the logic to activate a device administrator
was immediately falling through into the logic to remove it. As a result,
the add was immediately countermanded by a remove.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
8cecf89cec3ea14003482c046eec7d2aba8bb0ad 28-Jan-2010 Dianne Hackborn <hackbod@google.com> Update to follow device policy changes.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
61daf83ca8bcf1353e0e81316a2b3809ec7397c5 28-Jan-2010 Dianne Hackborn <hackbod@google.com> Update settings UI to support multiple device admins.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
b885afe4e7376a21d354ca11d4873930d9cce9ea 27-Jan-2010 Dianne Hackborn <hackbod@google.com> More device admin work:

- Show a warning before removing an admin, if desired.
- Additional message that can be shown when adding an admin.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java
28429033375c3876af56528bfc9ea6b541052fcb 26-Jan-2010 Dianne Hackborn <hackbod@google.com> Work on the device admin settings UI.

Improve the look of the UI, and add the confirmation screen
for enabling an administrator. This uses the new framework APIs
to show its description and policies it will control.
/packages/apps/Settings/src/com/android/settings/DeviceAdminAdd.java