Commit Graph

8236 Commits

Author SHA1 Message Date
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
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
Adam Lesinski
af2758a962 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: bfdc202

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

Change-Id: I5148dabc722ec2c31008ba05adb3ccdfa357857a
2016-04-18 22:35:27 +00:00
Adam Lesinski
bfdc2020b9 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-18 22:24:09 +00:00
Adam Lesinski
b7e1ce0775 Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: I1ccb6e93cc213810848f07d631d9d8de7c719803
2016-04-18 15:06:50 -07:00
Dianne Hackborn
67324c990c Work on issue #28221912: Starting service as foreground might...
...kill previous notification.

Add new platform API to detach a notification from a service
without dismissing it.

Also, while I am here, add some more @IntDefs.

Change-Id: I3bb46d9cd3db7f73716c8ced19c20fea800eb30d
2016-04-18 14:48:09 -07:00
Wei Wang
0765134cdf Merge "Merge "Use ConnectivityThread for RttManager." into nyc-dev am: f49b51e am: 1bfc472" into nyc-mr1-dev-plus-aosp
am: c85ae5e

* commit 'c85ae5efdf266bd08a6e0080b9049b950fcf0ed8':
  Use ConnectivityThread for RttManager.

Change-Id: I5dc193b1123a60d8bbd9e125745f4f8517bb7940
2016-04-18 21:41:44 +00:00
Wei Wang
1bfc472ffa Merge "Use ConnectivityThread for RttManager." into nyc-dev
am: f49b51e

* commit 'f49b51e000af2d17e315294f9584890d5e93fa33':
  Use ConnectivityThread for RttManager.

Change-Id: Icd3e0adf47fabb86f812b1875aca49379f65ca59
2016-04-18 21:28:22 +00:00
Wei Wang
f49b51e000 Merge "Use ConnectivityThread for RttManager." into nyc-dev 2016-04-18 21:17:25 +00:00
Tony Mak
59afde8c57 Show work challenge in if user in docked stack is locked am: 853304c am: 4dc4d3e
am: 771f2f4

* commit '771f2f457eb10b0bf0641bf3c12d6d5e6d38eb55':
  Show work challenge in if user in docked stack is locked

Change-Id: Ic8992dacbc4c550250abe7ace79854d900d25def
2016-04-18 15:50:54 +00:00
Tony Mak
4dc4d3ed0f Show work challenge in if user in docked stack is locked
am: 853304c

* commit '853304c0b11921db142a3945ab66fae5f0cc7d8a':
  Show work challenge in if user in docked stack is locked

Change-Id: I1a5ff10237639fa2f0c20c756594d1d04c16d07d
2016-04-18 15:40:43 +00:00
Tony Mak
853304c0b1 Show work challenge in if user in docked stack is locked
Register docked stack listener in ActivityManagerService.
If the docked stack is leaving minimized state, check whether the user
of the docked stack is locked. If yes, show credential confirmation.
Also, we now show work challenge in home task.

And we now scan the entire top task to handle the case the work app is
somewhere in the middle of the task. (eg: open personal camera in work app)

Bug: 27565539
Bug: 28094505

Change-Id: Iaf0738f43ae916a535b17949ec0f322bbfb194dc
2016-04-18 15:35:36 +00:00
Calin Juravle
2a727d7bd5 Move profile registration from bindApplication to LoadedApk
In order to capture profiles for apps which share the same VM and for
splits loaded without restart we need to move the profile registration
closer to where we create the class loaders (since bindApplication is
not called multiple times).

Moving the registration after class loader creation also allows us to
not profile apks which are already fully compiled.

Bug: 27539488
Bug: 27893309
Bug: 28012567
Change-Id: I6333f026f4f0680ca28e989f1686e3eac1145339
2016-04-18 15:28:40 +01:00
Calin Juravle
d44baa11a0 Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev am: 6aff67b am: f139143c
am: b8d5524

* commit 'b8d5524d8d7211b266e5405da7864c7f9eefae20':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: I22fca39e19f94f1fdc560e19ad27f78e5abdeca9
2016-04-18 11:00:55 +00:00
Calin Juravle
f139143ccc Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev
am: 6aff67b

* commit '6aff67bfcb9dcca6e3f26ff04dbe8f9806e5e8a5':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: Ib3e5d6ac34f14c6d6f0809d2f969422b49efea8f
2016-04-18 10:51:07 +00:00
Calin Juravle
6aff67bfcb Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev 2016-04-18 10:40:31 +00:00
Wale Ogunwale
3cce9525aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev am: 02ebaa0 am: 188b013
am: bba910f

* commit 'bba910f8a245614949f43565a6ba2ee01dabe752':
  Don't allow pinned activities to request visible behind

Change-Id: Ie3389a2354325045cc465513d7466d359e93d464
2016-04-18 04:38:46 +00:00
Wale Ogunwale
188b0139aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev
am: 02ebaa0

* commit '02ebaa02c41050b7223b9ec772da669810bff43b':
  Don't allow pinned activities to request visible behind

Change-Id: I78704c8b677f91b268d83da971b3f50bd479b6ba
2016-04-18 04:29:22 +00:00
TreeHugger Robot
02ebaa02c4 Merge "Don't allow pinned activities to request visible behind" into nyc-dev 2016-04-18 04:19:36 +00:00
Wale Ogunwale
43896cffe6 Don't allow pinned activities to request visible behind
Also, release visible behind when pinning a visible behind activity.

Bug: 28042883
Change-Id: I1162d7639626f669f648ff82f5c367cb7b3fe6e6
2016-04-16 10:54:30 -07:00
Adam Powell
f4cfbeda87 Merge "Retain loaders through stopped config changes" into nyc-dev am: e33901c
am: c108628

* commit 'c108628d33610975dd13564bf7750dff5eebaeaf':
  Retain loaders through stopped config changes

Change-Id: Ib63609d91efae1549c61b4f5fb8f2a1b24fe7ece
2016-04-15 21:52:14 +00:00
Adam Powell
c108628d33 Merge "Retain loaders through stopped config changes" into nyc-dev
am: e33901c

* commit 'e33901c2328d4583d5e6913f83e939960dda4263':
  Retain loaders through stopped config changes

Change-Id: Iefbafb4774933dde3acaee36f50f364fe0b3af76
2016-04-15 21:49:01 +00:00
Adam Powell
e33901c232 Merge "Retain loaders through stopped config changes" into nyc-dev 2016-04-15 21:40:53 +00:00
Wei Wang
bd3353a6c4 Use ConnectivityThread for RttManager.
Bug:27432949

Change-Id: I80fc02ff78981ca4798844c4d869b0eb60fbd84b
2016-04-15 12:45:34 -07:00
Adam Powell
cbade7f4d3 Retain loaders through stopped config changes
Framework edition

Previously we would throw away any stopped LoaderManagers when we went
to retain instances to pass along as nonConfigurationInstances during
config changes or similar activity restarts. This causes loaders to do
more work than they need to when a calling activity starts a new
activity on top, a config change happens (e.g. screen rotation) and
then the top activity is finished, restarting the caller in a new
configuration. The loaders would go through onReset unnecessarily,
potentially throwing away data to be reloaded again after the config
change completes.

Instead of throwing away stopped LoaderManagers in this case, restart
them and retain them across the config change so they can resume where
they left off.

Bug 27176186

Change-Id: Ia52c6448d2ad41dcb25d493770d9ffae20a19d2a
2016-04-15 11:14:37 -07:00
Calin Juravle
8f5770dcdb Register the UI Thread as a sensitive thread to the runtime
Bug: 27865109
Bug: 28065407
Change-Id: I46194d444530770f505ac5e653536be2da7dd08b
2016-04-15 18:38:21 +01:00
Benjamin Franz
44c60415c2 Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev am: a900359
am: 2f6a945

* commit '2f6a94511bc009b06c5de0ee5d6bfccffcc1a031':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: Ie5900faa37cff7c9d3db03f84ccbc5a81fe83d54
2016-04-15 15:45:33 +00:00
Benjamin Franz
2f6a94511b Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev
am: a900359

* commit 'a90035950019434012f32b8dbc5d278894484df3':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: I52db7e2e2fdb923c9fcd231a32bec0b2f11689c9
2016-04-15 15:41:57 +00:00
Benjamin Franz
bc33c8290f Revert "Revert "Throw security exception for non-parent aware APIs""
This reverts commit a26c626564.

Bug: 27532279
Change-Id: I0c0394a8abf12e7382e7083a0b9d7f8385c3a63d
2016-04-15 16:08:35 +01:00
Andrii Kulian
36c8a58cf0 Merge "Remember task which is being locked" into nyc-dev am: 5981b8c
am: 021af18

* commit '021af1800c352933d25f927dc357534c62a9e39c':
  Remember task which is being locked

Change-Id: I06c64b220fe20775510b938c5235acf026c83c7d
2016-04-15 04:40:24 +00:00
Andrii Kulian
021af1800c Merge "Remember task which is being locked" into nyc-dev
am: 5981b8c

* commit '5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a':
  Remember task which is being locked

Change-Id: Id672304edaa6a02777e79fe6b4fcdd64e3c5f7e8
2016-04-15 04:37:48 +00:00
Andrii Kulian
5981b8c2e8 Merge "Remember task which is being locked" into nyc-dev 2016-04-15 04:32:57 +00:00
Andrii Kulian
0f051f5abd Remember task which is being locked
We need to remember task which requested to be locked
because we can accidentally lock another task after
user interacts with pinning request dialog.

Bug: 27876860
Change-Id: Ie8e607df4380dd33ea9b3474afc247b02e31de07
2016-04-14 19:26:18 -07:00
Tim Murray
a93e7e6dc4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev am: 117cff7
am: 62047f9

* commit '62047f93d4948b5b5be1939c0700d12b960379a3':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I01e6021b1f756351358f83ee94ef70527adcaf5f
2016-04-15 00:01:56 +00:00
Tim Murray
62047f93d4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev
am: 117cff7

* commit '117cff790e34948e847d724be624ed2dd00bc82c':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I86b5cc6eddf38cdd015fe80f1180ca246a97352a
2016-04-14 23:58:22 +00:00