Commit Graph

9337 Commits

Author SHA1 Message Date
Suprabh Shukla
f9c376b786 resolve merge conflicts of 37ad463 to master
Change-Id: I51b2097ac3ea4ce3ec8bb29e674d1cdd789aa1a1
2016-09-07 15:55:04 -07:00
Makoto Onuki
37ad4639bb Allow DO/PO to be installed with certain preconfigured accounts. am: 5e7e0670c7
am: 9d46e5e044

Change-Id: I6a55f788b12c93b7be0503300c171f7f5a40fe9d
2016-09-07 21:47:47 +00:00
Makoto Onuki
9d46e5e044 Allow DO/PO to be installed with certain preconfigured accounts.
am: 5e7e0670c7

Change-Id: I9191a60bf4071b8205c04131cb2d97ef1a32fb19
2016-09-07 21:40:20 +00:00
Makoto Onuki
5e7e0670c7 Allow DO/PO to be installed with certain preconfigured accounts.
- Non-test-only DO/PO still can't be installed when there are
accounts.

- Test-only DO/PO can be installed even when there are accounts,
as long as all the accounts have the
"android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED" feature.
Some authenticators claim to have any features, so to detect it,
we also check android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED
and disallow installing if any of the accounts have it.

- Also add logs on certain important events in DPMS.

Bug 28928996

Change-Id: I62efce10e9cc22e994ea8cae91a4fafcce25dd77
2016-09-06 11:56:45 -07:00
Svetoslav Ganov
71c510236c resolve merge conflicts of bde1d34 to master
Change-Id: Id3cef32bb97cfe8483001e71207b65bc0bc6e304
2016-09-02 18:04:29 -07:00
Svetoslav Ganov
bde1d3458f Prevent apps to overlay other apps via toast windows am: aa07653d2e
am: dea62c6f58

Change-Id: I7ee488e4ac0fc312405680d04a480d473c176ac5
2016-09-02 23:46:20 +00:00
Svetoslav Ganov
aa07653d2e Prevent apps to overlay other apps via toast windows
It was possible for apps to put toast type windows
that overlay other apps which toast winodws aren't
removed after a timeout.

Now for apps targeting SDK greater than N MR1 to add a
toast window one needs to have a special token. The token
is added by the notificatoion manager service only for
the lifetime of the shown toast and is then removed
including all windows associated with this token. This
prevents apps to add arbitrary toast windows.

Since legacy apps may rely on the ability to directly
add toasts we mitigate by allowing these apps to still
add such windows for unlimited duration if this app is
the currently focused one, i.e. the user interacts with
it then it can overlay itself, otherwise we make sure
these toast windows are removed after a timeout like
a toast would be.

We don't allow more that one toast window per UID being
added at a time which prevents 1) legacy apps to put the
same toast after a timeout to go around our new policy
of hiding toasts after a while; 2) modern apps to reuse
the passed token to add more than one window; Note that
the notification manager shows toasts one at a time.

bug:30150688

Change-Id: Ia1dae626bd9e22541be46edb072aa288eb1ae414
2016-09-02 14:00:07 -07:00
Tony Mak
1970f97e47 Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner
Change-Id: Iaac182c69a30e941da3a017a923247d813881521
Fix: 27261692
2016-08-30 17:41:48 +01:00
Victor Chang
3f98ea1eee Merge "forceUpdateUserSetupComplete should have no effect in user build" 2016-08-30 12:38:53 +00:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Mark Lu
914a8a3060 docs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd am: eab610d0a6 am: b03a1b8b25
am: b49a7f8602

Change-Id: Ia961100dce636cdb5aae8f4882012a50d506b6f4
2016-08-29 23:20:47 +00:00
Etan Cohen
4503dc6fba [NAN] Provide calling package name to service
Useful for permission checks.

Bug: 30000323
Change-Id: I8c7f06cff346437aa24ca5da9822cbd7b20c59c4
(cherry picked from commit 7531a28e26)
2016-08-29 11:26:52 -07:00
Victor Chang
3577ed2556 forceUpdateUserSetupComplete should have no effect in user build
Bug:30031808
Change-Id: I908a495633e03ace770a8ec19196841d19dfd41d
2016-08-26 18:36:44 +01:00
Vladislav Kuzkokov
a820252460 Add DevicePolicyManager.setBackupServiceEnabled as hidden API.
BUG=28628532

Change-Id: I48c3423734e54b6a4d70e58d50c98c3e17790e0d
2016-08-26 14:31:04 +02:00
Mark Lu
b49a7f8602 docs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd am: eab610d0a6
am: b03a1b8b25

Change-Id: Iadf3e62a1e8b93ead2e341644a7b0f6f0ee0e17d
2016-08-26 00:50:13 +00:00
Mark Lu
c4e81b64f1 docs: fix broken links in Activity reference
am: fa43485910

Change-Id: I67134251790b12d53d31c6854073884f498ef1e5
2016-08-26 00:42:01 +00:00
Mark Lu
eab610d0a6 docs: fix broken links in Activity reference am: fa43485910
am: 497c2907fd

Change-Id: I35f07a633757dc83970accbe78b3173090e71099
2016-08-25 22:14:14 +00:00
Mark Lu
497c2907fd docs: fix broken links in Activity reference
am: fa43485910

Change-Id: I72cebe96e1ea0c1950ca316bc80c337bfdde9002
2016-08-25 21:54:49 +00:00
Chet Haase
df10332181 Document and deprecate various old, undocumented classes
These classes are mostly undocumented and, in some cases, completely
unobvious in what they do or how to use them. In some cases, I added
docs to explain the API. In other cases (ProgressDialog, ZoomButton,
DialerFilter), I deprecated the classes because there are far better ways
to accomplish that functionality with today's platform.

Issue #2164052 Underdocumented classes in Eclair

Change-Id: Ief0e7267852c2cb3c5ae604b3d902d66c89f4cd3
2016-08-25 12:38:46 -07:00
Andrew Scull
1aea3e73d1 Explain the IAE thrown by resetPassword. am: 60df33da54
am: aa96b68b66

Change-Id: I9bd4270f54e13b0ade22bace4c6899eef9fa1ae4
2016-08-25 15:12:33 +00:00
Andrew Scull
aa96b68b66 Explain the IAE thrown by resetPassword.
am: 60df33da54

Change-Id: Ia827b77a55544f6e815e13a86256ebcb80aea326
2016-08-25 15:06:33 +00:00
Andrew Scull
56bfc1cecf Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev 2016-08-25 15:01:18 +00:00
Makoto Onuki
bc3ee12097 Merge "Add api to update user_setup_completed flag to allow e2e testing in ManagedProvisioning" 2016-08-24 15:53:09 +00:00
Victor Chang
9bfc65f321 Add api to update user_setup_completed flag to allow e2e testing in ManagedProvisioning
Bug:30031808
Change-Id: Idd4b230931718a6d10f0fc41cdcf9bccb5c6354c
2016-08-24 11:48:09 +01:00
TreeHugger Robot
2e09d14f48 Merge "Bring back wtf() for missing services." 2016-08-23 22:46:51 +00:00
Jeff Sharkey
d79d203b35 Bring back wtf() for missing services.
Publish DropBox extremely early during boot process so that it can
pick up wtf() calls while booting.

Bug: 28634953
Change-Id: Ie71d53fc125ebc47fa08ef59a8b7e4f66f2e805c
2016-08-23 15:19:18 -06:00
TreeHugger Robot
0166811fad Merge "Separate transaction direction for fragment transitions." 2016-08-23 19:23:02 +00:00
Jorim Jaggi
6ace777436 Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac am: 3d19454ec9
am: e4af99d6b7

Change-Id: Ia74d06c44aa2b6d8bd75fa3db4fa5f5772c218d3
2016-08-23 18:04:57 +00:00
Jorim Jaggi
e4af99d6b7 Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac
am: 3d19454ec9

Change-Id: Ibd859202fd2db910170e8bda6f8c947cd05486f7
2016-08-23 16:43:54 +00:00
Jorim Jaggi
9d0879c6ac Change retail mode wallpaper (1/2)
am: 6c902d0453

Change-Id: I1ca69b6cc7450d7f7056e69e3cf7fab1ad2df624
2016-08-23 00:17:20 +00:00
TreeHugger Robot
c7136b3b3c Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev 2016-08-22 22:55:15 +00:00
George Mount
7fe4414891 Separate transaction direction for fragment transitions.
In preparation for optimizing fragment transactions, this
allows different directions for the fragment transactions being
executed during a transition. Currently, the add and pop
transactions are separated, but when later optimized, both
add and pop transactions will be run together.

Change-Id: Ia18826daf729f208945e605f96af85b8e139edf2
2016-08-22 15:49:00 -07:00
George Mount
c9373e5505 DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289)
(cherry picked from commit a3edbf6a5d)
2016-08-20 22:37:45 +00:00
Jorim Jaggi
6c902d0453 Change retail mode wallpaper (1/2)
Change-Id: I7ce5711e57bc39edf10fc7151f26168c6183d71e
Fixes: 30830249
2016-08-19 21:44:48 +00:00
Etan Cohen
ccb0b65be6 resolve merge conflicts of 6ffbcb3 to master
Change-Id: I23af5223f0e9810aa90fda4594ff6ccfc69b4053
2016-08-19 11:22:06 -07:00
George Mount
05051ef82b Fix NPE during Activity transition using wrong Activity. am: a3edbf6a5d
am: 34abaebd3b

Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f
2016-08-18 22:37:21 +00:00
George Mount
a3edbf6a5d Fix NPE during Activity transition using wrong Activity.
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289)
2016-08-18 17:15:43 +00:00
TreeHugger Robot
b67b8a6d6c Merge "Fix NPE during Activity transition using wrong Activity." 2016-08-18 17:13:53 +00:00
TreeHugger Robot
7d3d7ae556 Merge "Updating the javadoc of DevicePolicyManager#wipeData" 2016-08-16 21:47:37 +00:00
George Mount
3289bfa289 Fix NPE during Activity transition using wrong Activity.
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
2016-08-16 13:10:19 -07:00
Mark Lu
fa43485910 docs: fix broken links in Activity reference
Bug: 30142414
Bug: 30837469
Change-Id: If370e49fee32df41b7dab93d6c89c79a9835dabb
2016-08-12 16:05:17 -07:00
Jeff Sharkey
ce65646208 Merge "Take the "tf" out of "wtf"." 2016-08-11 21:21:54 +00:00
Jeff Sharkey
012d5e05cf Take the "tf" out of "wtf".
You can't DropBox until you have DropBox, otherwise bad things will
happen.

Bug: 28634953
Change-Id: I43c590ac329c7a544215df3023ad07a0b32b5691
2016-08-11 15:20:25 -06:00
Christopher Tate
328439d0a2 Check system & lock wallpaper backup eligibility independently am: 6172266154 am: 611afaf4ae
am: 9649aecab6

Change-Id: I8c4dd55fa63f0a9ffbcd7992ee29040f79ae1780
2016-08-11 20:43:44 +00:00
Christopher Tate
9649aecab6 Check system & lock wallpaper backup eligibility independently am: 6172266154
am: 611afaf4ae

Change-Id: I5d8361f2854647fae86847828d58154af06618c8
2016-08-11 20:35:43 +00:00
Jeff Sharkey
4d24cfe6ce Merge "Fix bugs around manager fetching." 2016-08-11 18:52:44 +00:00
Jeff Sharkey
e2fc1055c5 Merge "Avoid caching services with missing binders." 2016-08-11 18:52:03 +00:00
Christopher Tate
6172266154 Check system & lock wallpaper backup eligibility independently
Bug 30751829

Change-Id: Ic94689dd63238449222d1aea07231d9fd29fc76d
2016-08-11 11:22:14 -07:00
Etan Cohen
7531a28e26 [NAN] Provide calling package name to service
Useful for permission checks.

Bug: 30000323
Change-Id: I8c7f06cff346437aa24ca5da9822cbd7b20c59c4
2016-08-11 09:31:21 -07:00