Tony Mak
d412dfc2a8
Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55
...
am: db9d529499
* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
2016-05-18 17:18:36 +00:00
Sudheer Shanka
db9d529499
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
...
am: 0d902adbbc
* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
2016-05-18 17:14:29 +00:00
TreeHugger Robot
0d902adbbc
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
2016-05-18 17:09:46 +00:00
Yohei Yukawa
bf4c8f730b
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
...
am: ddaf3f4681
* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
Move LocaleList to avoid layering violation.
Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
Move LocaleList to avoid layering violation.
Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
Move LocaleList to avoid layering violation.
Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +00:00
Andrii Kulian
5417ca597a
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac
...
am: 06a325c3e3
* commit '06a325c3e3b1925c2208892f13570f08e180b12c':
DO NOT MERGE Hide decor caption APIs
Change-Id: I6eb614317b520e5a902dbc7533f3f08b68ed4861
2016-05-18 01:00:50 +00:00
Andrii Kulian
06a325c3e3
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
DO NOT MERGE Hide decor caption APIs
Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
2016-05-18 00:55:12 +00:00
Andrii Kulian
88a2a7be72
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
DO NOT MERGE Hide decor caption APIs
Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
2016-05-18 00:55:12 +00:00
Andrii Kulian
47aa3f61ac
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
2016-05-18 00:51:17 +00:00
Adrian Roos
16e54ef2ff
Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf
...
am: 3a0f4f4b64
* commit '3a0f4f4b642087138b59a18612be437376652c92':
Adjust Notification APIs per API council
Change-Id: I20a1e1a542f48532be1b9d71bb5fb2eb0498b395
2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
Adjust Notification APIs per API council
Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
2016-05-18 00:13:14 +00:00
Adrian Roos
6cb72ee2eb
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
Adjust Notification APIs per API council
Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
2016-05-18 00:13:07 +00:00
TreeHugger Robot
718ba309cf
Merge "Adjust Notification APIs per API council" into nyc-dev
2016-05-18 00:06:30 +00:00
Yohei Yukawa
23cbe85610
Move LocaleList to avoid layering violation.
...
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.
Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Adrian Roos
96b7e20ba6
Adjust Notification APIs per API council
...
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.
Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
2016-05-17 15:35:33 -07:00
Dianne Hackborn
a648b098f8
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev am: 77ad5f1657
...
am: ab82de14b1
* commit 'ab82de14b1c6bdf44fa2cac96c37620f0f2319f0':
Work on issue #28689719 : Runtime restart
Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
2016-05-17 22:21:24 +00:00
Dianne Hackborn
ebfbc39537
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
...
am: 77ad5f1657
* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
Work on issue #28689719 : Runtime restart
Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
2016-05-17 22:07:01 +00:00
Dianne Hackborn
ab82de14b1
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
...
am: 77ad5f1657
* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
Work on issue #28689719 : Runtime restart
Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
2016-05-17 22:06:57 +00:00
Dianne Hackborn
77ad5f1657
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
2016-05-17 21:58:21 +00:00
Adrian Roos
31459c3202
Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700
...
am: efc9c88d00
* commit 'efc9c88d002263f748716405f7e63becc3685211':
Fix broken MessagingStyle
Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
2016-05-17 21:22:39 +00:00
Adrian Roos
efc9c88d00
Merge "Fix broken MessagingStyle" into nyc-dev
...
am: 8802fd0700
* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
Fix broken MessagingStyle
Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
2016-05-17 21:17:33 +00:00
Adrian Roos
d91b14d862
Merge "Fix broken MessagingStyle" into nyc-dev
...
am: 8802fd0700
* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
Fix broken MessagingStyle
Change-Id: I611823cbd36336828f6ee1b57a6cef3908d8ef6f
2016-05-17 21:17:10 +00:00
Adrian Roos
8802fd0700
Merge "Fix broken MessagingStyle" into nyc-dev
2016-05-17 21:02:25 +00:00
Andrii Kulian
5c96320e40
DO NOT MERGE Hide decor caption APIs
...
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.
Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
2016-05-17 20:56:24 +00:00
Dianne Hackborn
2675616719
Work on issue #28689719 : Runtime restart
...
There are few paths I can see to get a null intent down into
the framework at this point. Add in some checks and reports
at those places to mitigate and report such problems.
Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
2016-05-17 13:40:44 -07:00
Sudheer Shanka
93f8fd714a
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
...
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
2016-05-17 13:27:27 -07:00
Dianne Hackborn
ae5664af28
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5
...
am: a24af982ff
* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
Fix issue #27532364 : Security Vulnerability in IIntentSender.send
Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
2016-05-17 18:39:42 +00:00
Dianne Hackborn
4d7e92b56b
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
...
am: 607844efa5
* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
Fix issue #27532364 : Security Vulnerability in IIntentSender.send
Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
2016-05-17 18:38:28 +00:00
Dianne Hackborn
a24af982ff
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
...
am: 607844efa5
* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
Fix issue #27532364 : Security Vulnerability in IIntentSender.send
Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Dianne Hackborn
607844efa5
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
2016-05-17 18:19:36 +00:00
Michael Kwan
4fab094b07
Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
...
am: 59bce44aaa
* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
Modified AlertController to allow themes to specify custom implementation.
Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
2016-05-17 18:14:47 +00:00
Michael Kwan
59bce44aaa
Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
2016-05-17 18:03:38 +00:00
Phil Weaver
11ece94702
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
...
am: 89d3ba72b7
* commit '89d3ba72b7f3318d8911b136af306375051c828a':
Hide UiAutomation#destroy as test api.
Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
2016-05-17 17:32:24 +00:00
Phil Weaver
89d3ba72b7
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
2016-05-17 17:27:01 +00:00
Clara Bayarri
60d0910dc8
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
...
am: bee2648027
* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
Remove "if it succeeds" wording from requestShowKeyboardShortcuts
Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
2016-05-17 09:21:15 +00:00
Clara Bayarri
bee2648027
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
2016-05-17 09:12:36 +00:00
Wale Ogunwale
33cffe3717
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
...
am: b406dd20ee
* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
Fixed bugs with starting windows when displayng forcedResized activity
Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e
Fixed bugs with starting windows when displayng forcedResized activity
...
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.
Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Michael Kwan
cc6e6f0e0a
Modified AlertController to allow themes to specify custom implementation.
...
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
2016-05-16 15:36:22 -07:00
Phil Weaver
e6269c3f1d
Hide UiAutomation#destroy as test api.
...
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Clara Bayarri
ab591ba4b6
Remove "if it succeeds" wording from requestShowKeyboardShortcuts
...
Bug: 28775576
Change-Id: Ib7bc2d78cc074c14384f5a86437c684462f1fb54
2016-05-16 17:48:16 +01:00
Clara Bayarri
8184f2e545
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
...
am: d34396443e
* commit 'd34396443e712a96572d26c820809a9485e57da3':
Rename requestKeyboardShortcutsHelper
Change-Id: I0522d4d9bcfdce6b79dc672dcc0c515dc747b99d
2016-05-16 15:08:15 +00:00
Clara Bayarri
ac6f034f2a
Rename requestKeyboardShortcutsHelper
...
Per API council feedback
Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Narayan Kamath
150664c275
LoadedApk: Avoid unnecessary work when mIncludeCode == false.
...
am: 8995b00ce8
* commit '8995b00ce8f68f2a285a97c2ce711bea8c61179e':
LoadedApk: Avoid unnecessary work when mIncludeCode == false.
Change-Id: Ib34104b27c85d4b74e8505ca3030ae5578ed4599
2016-05-16 10:45:24 +00:00
Narayan Kamath
8995b00ce8
LoadedApk: Avoid unnecessary work when mIncludeCode == false.
...
We don't need to set up JIT profiles and register usage etc when
the package context we're trying to construct doesn't request code.
This will correct accounting for packages which are only used for
resources.
bug: 28519185
Change-Id: I849675efa76c8100ae937de478b52254babe384c
2016-05-16 10:39:08 +00:00
Dianne Hackborn
0c4e6a8da3
Fix issue #27532364 : Security Vulnerability in IIntentSender.send
...
We need to make IIntentSender oneway... but when the system is
calling that for itself, it needs to be able to return a result code.
Solution: instead of directly calling the interface, we have a new
IPC through the activity manager. If the thing being used is the
activity manager impl, it can do the synchronous send and return
the result directly in place. If not, you only get asynchronous
sending and thus never a failure result back (too bad for you!).
Change-Id: I4096e5b00063e8dba66230585a2dfe67e35e8092
2016-05-13 17:37:08 -07:00
Andrew Solovay
0b15a5c94f
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e
...
am: f975b74c0c
* commit 'f975b74c0c60160092262fbc05f42f7e2584f0bd':
docs: Updates to multi-window and related docs.
Change-Id: Ia7b8adbe3140a59d2e2433b3795e58a16763527c
2016-05-13 22:10:49 +00:00