Commit Graph

8269 Commits

Author SHA1 Message Date
Tony Mak
c65e3e8331 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715 am: f5f982f014
am: b9362cf633

* commit 'b9362cf6332ee99042e6630c163babca04769aca':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I1ae8d5399470e449947d3ecf57285d39145d0a1e
2016-04-21 16:00:57 +00:00
Tony Mak
f5f982f014 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: Id0e6e3cbc8cbea4e87625f479eb0d83dbf22266e
2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
2016-04-21 16:43:08 +01:00
Amith Yamasani
7f6e30dfdf Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc am: bc25c87c57
am: 13b566915b

* commit '13b566915b31d4ef1537bc5d4460da88074fc7a6':
  Throw better exception when startVoiceActivity fails

Change-Id: I41471adc060db774ed6d7e71819613b3691b85b3
2016-04-21 02:33:46 +00:00
Shreyas Basarge
9dabe94fb6 Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: f153182db7
am: b8408d8eb7

* commit 'b8408d8eb755da42db3cf25868920d5b583b77ca':
  Fix logspam by JobInfo

Change-Id: I7bc166a3353b2a3d29719744d4f006662f738d8f
2016-04-21 02:32:12 +00:00
Amith Yamasani
bc25c87c57 Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
  Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
2016-04-21 00:50:10 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 2016-04-21 00:46:32 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Adam Lesinski
604a0a9fc2 Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0 am: 40c6118
am: fc2de302f4

* commit 'fc2de302f484cb95cf2b15e5976324996f5a3882':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I9fb7f2df3d37cb4ba6cb8fa9e3fc10a7999c6e36
2016-04-21 00:36:36 +00:00
Christopher Tate
57fe3eea85 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f am: 9e92c03
am: cdfe208a99

* commit 'cdfe208a99906b4157305ea0c4af06d2e303d830':
  Don't back up wallpapers that we've been told not to

Change-Id: I45e4c3c47e371c3808e5669e2c7af6d8405edb7a
2016-04-21 00:24:55 +00:00
Shreyas Basarge
b0c83ec062 Fix logspam by JobInfo
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
2016-04-21 00:44:58 +01:00
Adam Lesinski
40c611853e Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am: 1362ae0

* commit '1362ae062a196c8450a0b649dd0c5af66d1f05a1':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
2016-04-20 22:56:11 +00:00
Adam Lesinski
1362ae062a Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev 2016-04-20 22:46:05 +00:00
Christopher Tate
9e92c03991 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am: 665189f

* commit '665189f92646d34bf02082120cba3c62aa718770':
  Don't back up wallpapers that we've been told not to

Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
2016-04-20 22:13:17 +00:00
Chris Tate
665189f926 Merge "Don't back up wallpapers that we've been told not to" into nyc-dev 2016-04-20 22:10:40 +00:00
Christopher Tate
d7faf53605 Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
2016-04-20 14:34:07 -07:00
Trevor Johns
0392182bff Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8
am: e1b5670

* commit 'e1b56701fd219227adae615fe81f03d5db4ae433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
2016-04-20 21:32:39 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
2016-04-20 21:15:11 +00:00
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +00:00
Adam Lesinski
3477927db4 ResourcesManager: Throw exception if failed to load asset path
Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.

Throw a proper exception instead, detailing which path failed to load.

Bug:28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec
2016-04-20 13:36:19 -07:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Rubin Xu
7f55d526f1 Merge "Kill foreground apps when turning off work" into nyc-dev am: 49425d6 am: 48cef81
am: 512ab59

* commit '512ab599fc903da21b67c0c4d01ce9ffb8e6d68f':
  Kill foreground apps when turning off work

Change-Id: I83e0e9792225416c6a0c9de4a8201dcb2e37666f
2016-04-20 09:46:31 +00:00
Rubin Xu
48cef81f6e Merge "Kill foreground apps when turning off work" into nyc-dev
am: 49425d6

* commit '49425d612cee3864a316e9ecb6ec3faeae519b1e':
  Kill foreground apps when turning off work

Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
2016-04-20 09:40:38 +00:00
Rubin Xu
49425d612c Merge "Kill foreground apps when turning off work" into nyc-dev 2016-04-20 09:33:52 +00:00
Kenny Guy
ed4ae966a4 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae am: 1ac021e
am: 28a12ba

* commit '28a12ba5f6313d489d4b8e3c9dd6b3e06da6624e':
  Add test method to remove admins.

Change-Id: I32d81f5cb92a680f98446a8b735f6d2b0f501f64
2016-04-19 22:00:40 +00:00
Amith Yamasani
28a12ba5f6 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae
am: 1ac021e

* commit '1ac021e6245f7a9eb2aaf208bbb506541f6dd8ab':
  Add test method to remove admins.

Change-Id: I8f59c19521ea371cf9ef5a29c1dbfa3187a548ee
2016-04-19 21:57:19 +00:00
Kenny Guy
75d4db49d9 Merge "Add test method to remove admins." into nyc-dev
am: 3c5ceae

* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
  Add test method to remove admins.

Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
2016-04-19 21:53:23 +00:00
Amith Yamasani
3c5ceae1d3 Merge "Add test method to remove admins." into nyc-dev 2016-04-19 21:46:41 +00:00
Kenny Guy
38dcca51a7 Add test method to remove admins.
Add test method to remove admins that declare
FLAG_TEST_APP without informing them.
The method will also remove the device and profile
owner status of the admin.

Bug: 28027468
Change-Id: Idb4d3299a9c6595c94bfb424546cd8a384131835
2016-04-19 20:10:56 +01:00
Amith Yamasani
4244978621 Throw better exception when startVoiceActivity fails
Introduced new error codes so that Instrumentation can
include the correct message in the exception.

Bug: 28216630
Change-Id: I93ee77153cdad11fa208c74c28c6790db27c9753
2016-04-19 11:45:51 -07:00
Dianne Hackborn
2f9a2fe046 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev am: 9c211a3 am: bf7e134
am: dbc4e4f

* commit 'dbc4e4fa83d6fb460165be22798bbf04422be9c2':
  Work on issue #28221912: Starting service as foreground might...

Change-Id: I243f791317962d2ab9eea156b0f146f6fcc96fcb
2016-04-19 18:29:38 +00:00
Dianne Hackborn
bf7e134316 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev
am: 9c211a3

* commit '9c211a339689a2e54da3315ccdbf22add472c76a':
  Work on issue #28221912: Starting service as foreground might...

Change-Id: I9f94c6adca6891ac0e43b83f45001092536c7ee9
2016-04-19 18:18:38 +00:00
Dianne Hackborn
9c211a3396 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev 2016-04-19 18:10:28 +00:00
Andrii Kulian
b424d5600c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0 am: 2bf9a05
am: cdc760c

* commit 'cdc760ca3c3772b33e08fbfa8a2346701e97c14c':
  Recreate activity with correct configuration

Change-Id: I9d85a1cd4147e6b173a31eabb439164192dbc8cf
2016-04-19 16:35:19 +00:00
Andrii Kulian
cdc760ca3c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0
am: 2bf9a05

* commit '2bf9a05f08f7e7bfc3f57041a9cfe3b591da4e03':
  Recreate activity with correct configuration

Change-Id: I9c5e383cbeb37c7a3321b1c441c72ef8d305b453
2016-04-19 16:28:32 +00:00
Andrii Kulian
9df97927ab Merge "Recreate activity with correct configuration" into nyc-dev
am: 5ac2da0

* commit '5ac2da04c1321e8620fc85afae7a168c01ce218b':
  Recreate activity with correct configuration

Change-Id: I0ef3b390763eb10028ce0ad76d2ead9655112926
2016-04-19 16:25:24 +00:00
Andrii Kulian
5ac2da04c1 Merge "Recreate activity with correct configuration" into nyc-dev 2016-04-19 16:19:05 +00:00
Calin Juravle
de5482672b Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev am: f016d3a am: b64b02f
am: ac2867b

* commit 'ac2867bed213cfefc93d6193e5c4d7fb01918bce':
  Move profile registration from bindApplication to LoadedApk

Change-Id: I7cbb81a60c190c9cd1bf7895fa667bef992eba54
2016-04-19 15:45:05 +00:00
Calin Juravle
b64b02fa9a Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
am: f016d3a

* commit 'f016d3aef7711bf6703d9ef053c40afabdaf71a9':
  Move profile registration from bindApplication to LoadedApk

Change-Id: I1aba5c20a14e701da089388f4455cbb76762141b
2016-04-19 15:38:46 +00:00
TreeHugger Robot
f016d3aef7 Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev 2016-04-19 15:29:19 +00:00
Rubin Xu
f8451b9815 Kill foreground apps when turning off work
While work apps will all be killed as we stop the profile user when
turning off work, this can sometimes take a while. So let's kill the
foreground apps as soon as work profile is being turned off to make
the user experience nicer.

Bug: 27631526
Change-Id: Icdd3799385a98ee531b0b4247e8ede78f6f10da8
2016-04-19 14:23:33 +01:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Andrii Kulian
d0ad938760 Recreate activity with correct configuration
Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.

This CL updates configuration when activity is created from
override config.

Bug: 27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f
2016-04-18 20:54:20 -07:00
Adam Powell
e155dcefca Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev am: de7b2ed am: 76b2c0d
am: f6267a0

* commit 'f6267a0ac1fcfdd2f83a9b20934bdf4bea9ee65f':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I38d063ed28041d07f188250408e98c5272be2d11
2016-04-18 23:56:20 +00:00
Adam Powell
76b2c0d087 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
am: de7b2ed

* commit 'de7b2ed881d75cb7f21ae2199b9af68ae019becf':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I4bf16f207710cc9b9214d4c97e260a1348c3fe19
2016-04-18 23:50:51 +00:00
Adam Powell
de7b2ed881 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev 2016-04-18 23:41:41 +00:00
Adam Powell
ef4d99f016 Be bug-compatible with Fragment#setUserVisibleHint < N
Prior to Android N we were simply checking if a fragment had a
FragmentManager set before we would trigger a deferred
start. Unfortunately this also gets set before a fragment transaction
is committed, so if setUserVisibleHint was called before a transaction
commit, we would start the fragment way too
early. FragmentPagerAdapter triggers this situation.

Unfortunately some apps relied on this timing in overrides of
setUserVisibleHint on their own fragments, and expected, however
erroneously, that after a call to super.setUserVisibleHint their
onStart methods had been run.

Bug 28184671

Change-Id: Ie40d5f6963d312c2fad4a48fb4f992d33e65c83b
2016-04-18 16:39:22 -07:00
Adam Lesinski
a5c005d992 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: bfdc202 am: ea9d9daf2
am: 877b275

* commit '877b2750305f173bbb25495de446c377021bf6ae':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I2cf0affd8b90cdb13b4a0db5c76fc4be67b7baab
2016-04-18 22:43:20 +00:00
Adam Lesinski
877b275030 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: bfdc202
am: ea9d9daf2

* commit 'ea9d9daf2b70f738c0adad166e9db89c370b5c1c':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I569a7485304241339ab022f74ea8e72a6133c0ef
2016-04-18 22:38:04 +00:00