Commit Graph

9296 Commits

Author SHA1 Message Date
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
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
Jeff Sharkey
73ea0ae15f Fix bugs around manager fetching.
A recent patch started returning "null" when a Binder service
required to provide a manager wasn't yet registered.

This fixes four locations where that new logging was triggered: in
two cases by adjusting the fetching ordering, and in two other cases
by only fetching when the device supports the manager.

Bug: 28634953
Change-Id: I84dbccffa4ac760c10a2bbcb234f21272bfecb91
2016-08-11 09:44:34 -06:00
Jeff Sharkey
49ca529a85 Avoid caching services with missing binders.
When fetching system services early during boot, if the underlying
binder interface hasn't been published yet, we end up caching a
manager class that is broken for the remainder of the process
lifetime, and innocent downstream callers end up using the broken
cached manager.

Fix this by using an explicit exception to quickly abort manager
creation when the underlying binder is missing.  The exception is
only used to skip the remainder of the manager creation, and it
doesn't actually crash the process.

Bug: 28634953
Change-Id: I0cb62261e6d6833660704b93a11185aa11a2ac97
2016-08-11 09:44:30 -06:00
Suprabh Shukla
556b05a9d6 Updating the javadoc of DevicePolicyManager#wipeData
Updating the javadoc of DevicePolicyManager#wipedata to clarify
that the calling user, if not a primary user, will get deleted

Bug: 29253518
Change-Id: I84b316b1a81ebeef5aa3d802058c201f89c257b0
2016-08-10 16:31:54 -07:00
Dianne Hackborn
defc63c048 A little more on issue #30766518: Document what targeting N does am: 5f1649e852 am: 6ffef759da
am: f83a8ffc20

Change-Id: Ia189a9c29812a1e2d09b1bddb65c7f537b0fe9bd
2016-08-10 19:26:55 +00:00
Dianne Hackborn
f83a8ffc20 A little more on issue #30766518: Document what targeting N does am: 5f1649e852
am: 6ffef759da

Change-Id: I23bde6943a153f353c8c2cc3a1f7c4db2cec00b9
2016-08-10 17:50:18 +00:00
Dianne Hackborn
6ffef759da A little more on issue #30766518: Document what targeting N does
am: 5f1649e852

Change-Id: Icf776d4dcf8ef16432eee0686784b8b0146e4ed9
2016-08-10 17:45:14 +00:00
Dianne Hackborn
848c690f69 Merge "A little more on issue #30766518: Document what targeting N does" into nyc-mr1-dev 2016-08-10 17:38:02 +00:00
Adrian Roos
8171d9e0af Notification: Reuse drawable in Header if Icon unchanged am: c4337a3569 am: dd33f36fc4
am: 425ade9ef0

Change-Id: Ifb22fc29cdfb3adef1bfd4f49dc30753b30f403c
2016-08-10 17:28:14 +00:00
Adrian Roos
425ade9ef0 Notification: Reuse drawable in Header if Icon unchanged am: c4337a3569
am: dd33f36fc4

Change-Id: Ia24b71281669458d544ea34cb643265610ef020a
2016-08-10 17:12:38 +00:00
Adrian Roos
dd33f36fc4 Notification: Reuse drawable in Header if Icon unchanged
am: c4337a3569

Change-Id: I8e7da247e9b4d9a9acd46c29ca29d34409bb9453
2016-08-10 17:06:17 +00:00
Adrian Roos
d4a95806ab Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev 2016-08-10 16:52:15 +00:00
Dianne Hackborn
f49cfb874e Fix issue #30766518: Document what targeting N does am: b34cbedb4e am: 3a585b86be
am: 22fdbab5d0

Change-Id: Ic9beb458f4332b9ec72c4b4b4178a5bce1fcac82
2016-08-10 01:24:20 +00:00
Dianne Hackborn
22fdbab5d0 Fix issue #30766518: Document what targeting N does am: b34cbedb4e
am: 3a585b86be

Change-Id: I72821636543c9c31da4c6a8ac6d77a8de5d78d1f
2016-08-10 01:15:25 +00:00
Dianne Hackborn
5f1649e852 A little more on issue #30766518: Document what targeting N does
Change-Id: I67f2bfd01261a4304b532495a0d3cc791726ed5e
2016-08-09 18:00:31 -07:00
Dianne Hackborn
3a585b86be Fix issue #30766518: Document what targeting N does
am: b34cbedb4e

Change-Id: I2d2c45ef1dc9528b2b84778532edebac8a9e7712
2016-08-10 00:57:54 +00:00
Dianne Hackborn
75cdd5f68f Merge "Fix issue #30766518: Document what targeting N does" into nyc-mr1-dev 2016-08-10 00:45:55 +00:00
Chong Zhang
717b2b9cd0 Merge "Put activity into stopped state if recreated while stopped" 2016-08-09 22:48:11 +00:00
Chong Zhang
fec694eca1 Put activity into stopped state if recreated while stopped
Move handling of recreate from client side to AMS, so that relaunch
happens at the right condition and activity goes to right state
after it's relaunched.

bug: 30060825
Change-Id: Ia475c26927b305eb25ae12be8640aab1fb7677a0
2016-08-09 15:19:02 -07:00
Hemal Patel
36316ed2ea Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6 am: dabee01e9b am: 3547fd0642
am: b4bd409237

Change-Id: If00a0e3c869e6dba3e844ad59b5607f1b411f649
2016-08-09 21:27:21 +00:00
Hemal Patel
b4bd409237 Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6 am: dabee01e9b
am: 3547fd0642

Change-Id: I325c16b92f193be2ff701da64e3896979441d6e7
2016-08-09 21:19:50 +00:00
Hemal Patel
f8c0a138fb Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
am: dabee01e9b

Change-Id: I6a17d73c3dab8980c57e9f6c9617bb465c48f1a5
2016-08-09 21:10:40 +00:00
Hemal Patel
3547fd0642 Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
am: dabee01e9b

Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
2016-08-09 21:10:34 +00:00
Dianne Hackborn
b34cbedb4e Fix issue #30766518: Document what targeting N does
Also small documentation cleanup in a few other places.

Change-Id: I16581c751aa0ffa146faba3b140a8fa2170f4520
2016-08-09 13:21:24 -07:00
Adrian Roos
c4337a3569 Notification: Reuse drawable in Header if Icon unchanged
Mitigates an issue where a LevelListDrawable would constantly
be reloaded even if unchanged. To avoid this, small icons are
now only reloaded if they no longer point to the same resource.

Note that StatusBarIconView already has this logic.

Change-Id: I6be436e5cef7b7ca91a28edc413b1aaa0f1007d5
Fixes: 30496073
2016-08-09 12:31:20 -07:00
Hemal Patel
a8e1c75bf6 Docs: Fixed the link that loads Fragments guide
In the class description, fixed the reference link that points to the
Fragments guide.

Bug: 29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
2016-08-08 16:43:22 -07:00
Selim Cinek
8257bff5a0 Fixes a bug where setting a null bigLargeIcon would not clear it am: e99acb29db am: c39f8c444a
am: 90307e081d

Change-Id: I309bb41f8cb6201d1016f488c3478dc772ba4f12
2016-08-08 21:05:20 +00:00
Selim Cinek
90307e081d Fixes a bug where setting a null bigLargeIcon would not clear it am: e99acb29db
am: c39f8c444a

Change-Id: Ie8f89574e35cb581b6f9b867a3fdff83bd12eed4
2016-08-08 19:41:16 +00:00
Selim Cinek
c39f8c444a Fixes a bug where setting a null bigLargeIcon would not clear it
am: e99acb29db

Change-Id: Ib5f175bc50d8110f708c3541b3f0c0e715c41b87
2016-08-08 19:30:21 +00:00
Selim Cinek
5a3e33a82a Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev
* changes:
  Improved the transition when clicking on the last notification
  Fixed a bug that could lead to an empty notification
  Removed contentDescriptions that hindered accessibility usability
  Fixes a bug where setting a null bigLargeIcon would not clear it
  Fixed the transition of the background of the notifications
  Fixed a bug where the notification would fade out in a ugly way
2016-08-08 19:18:33 +00:00
Andrew Scull
3f81f4edaf Explain the IAE thrown by resetPassword.
DevicePolicyManager.resetPassword can throw an IllegalArgumentException
which is now documented.

Bug: 30105812
Change-Id: Ied02a0586ad62cca636c46da4faa16df64e17e5a
2016-08-08 14:03:01 +00:00
Christopher Tate
776a0890f6 Fix "adb backup -shared" am: 60af594c3e am: f300d9760b
am: 0ddcc58272

Change-Id: I8f291b75698c4acbfc667ce227a1e95e5b2aa50a
2016-08-05 18:22:03 +00:00
Christopher Tate
0ddcc58272 Fix "adb backup -shared" am: 60af594c3e
am: f300d9760b

Change-Id: Ic8f59fe5cc4223b101117373e8aa9429621ca0b2
2016-08-05 18:16:47 +00:00
Christopher Tate
f300d9760b Fix "adb backup -shared"
am: 60af594c3e

Change-Id: I47df84d251e67bc54a5f5c40cfaab65813f170a5
2016-08-05 18:10:33 +00:00
Chris Tate
b3690ccf2c Merge "Fix "adb backup -shared"" into nyc-mr1-dev 2016-08-05 18:04:25 +00:00
Todd Kennedy
8d69e9c93b Move EphemeralResolverService am: 31b95e0265 am: fa67fad84e
am: 8c073e0aad

Change-Id: I2fb2add1e4431c2c802430990f99807934878e84
2016-08-05 17:58:25 +00:00
Todd Kennedy
8c073e0aad Move EphemeralResolverService am: 31b95e0265
am: fa67fad84e

Change-Id: Ieabd373b5557e03c6a189f070c8f79998e7a5a0a
2016-08-05 17:52:00 +00:00
Todd Kennedy
fa67fad84e Move EphemeralResolverService
am: 31b95e0265

Change-Id: I16533b342433fc1042e0d78e1be8e43a431031a6
2016-08-05 17:47:17 +00:00
TreeHugger Robot
9d9621f472 Merge "Move EphemeralResolverService" into nyc-mr1-dev 2016-08-05 17:37:35 +00:00
Todd Kennedy
31b95e0265 Move EphemeralResolverService
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
2016-08-05 07:17:52 -07:00
Christopher Tate
60af594c3e Fix "adb backup -shared"
An accidental side-effect of introducing the XML content file and its
domain semantic checking was that the shared-storage domain got
dropped on the floor.  Now the mechanism understands what it means
again.

Bug 29999884

Change-Id: I22b99c96869683d1a92430f237dda54b170b8f60
2016-08-04 17:23:20 -07:00