Commit Graph

8554 Commits

Author SHA1 Message Date
Ben Lin
ba92ba5cc3 Merge "Add support for search in DownloadManager." 2016-05-10 23:32:03 +00:00
Amith Yamasani
d99b6fde12 Merge "Fix multi-window assiststructure trashing" into nyc-dev am: a66d395490 am: 0ce0116338
am: 9165f15e7d

* commit '9165f15e7d171db6d8c91be84e6bacd99d672e6f':
  Fix multi-window assiststructure trashing

Change-Id: I6a323c1c75a8ff9fe9f891ee1ecb6b0f25e1b034
2016-05-10 22:38:06 +00:00
Amith Yamasani
0ce0116338 Merge "Fix multi-window assiststructure trashing" into nyc-dev
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: I8bf4366b8e5bf7b0c37a9f81e2d0303b8dfdd22d
2016-05-10 22:32:53 +00:00
Amith Yamasani
a66d395490 Merge "Fix multi-window assiststructure trashing" into nyc-dev 2016-05-10 22:29:20 +00:00
Adam Powell
9db9897215 Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f am: 6e90b67dfa
am: 82e644de2f

* commit '82e644de2f1db76e20e676086b580e224d5d9d5b':
  Move Activity multi-window event logic out of the public methods

Change-Id: I2d7e79c29cbcad62727ed701c1e7d0519deca24e
2016-05-10 21:46:07 +00:00
Winson
0c146dacff Merge "Reducing the number of recent tasks we keep." into nyc-dev am: 9e935820b5 am: 9fc0a7c4c4
am: c4b7595962

* commit 'c4b7595962d217d07596469b378831630dd61d72':
  Reducing the number of recent tasks we keep.

Change-Id: If80c8f44ebee97ff30cc858ea9edf6ec99909e3b
2016-05-10 21:45:47 +00:00
Ben Lin
ce763d8bac Add support for search in DownloadManager.
Bug: 26524617
Change-Id: I41c0f92381bec8ad06db73b25ec67466f368b55c
2016-05-10 21:45:25 +00:00
Adam Powell
82e644de2f Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f
am: 6e90b67dfa

* commit '6e90b67dfaf02c236b542951dfaac3a7d805ef21':
  Move Activity multi-window event logic out of the public methods

Change-Id: I1eb6677d8ecd2208b20c2094eb4d708f6e20bc14
2016-05-10 21:40:16 +00:00
Winson Chung
c4b7595962 Merge "Reducing the number of recent tasks we keep." into nyc-dev am: 9e935820b5
am: 9fc0a7c4c4

* commit '9fc0a7c4c4e8eeddc6b4a74267731b26e87a20f5':
  Reducing the number of recent tasks we keep.

Change-Id: I184a3a28a3365c897f108f93947168f228c1c235
2016-05-10 21:40:07 +00:00
Adam Powell
d8cc73d92b Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
am: 56e2aeba8f

* commit '56e2aeba8fb40190dbe1303ae1d299e77e764b44':
  Move Activity multi-window event logic out of the public methods

Change-Id: I74706461487dde9e4f3ff3ff62be4e5778190c52
2016-05-10 21:37:05 +00:00
Winson
4f4152a9e2 Merge "Reducing the number of recent tasks we keep." into nyc-dev
am: 9e935820b5

* commit '9e935820b5d0134d71fc5ae51001b276ab603c51':
  Reducing the number of recent tasks we keep.

Change-Id: If44266c1872505f90cb8ae60c6a8fbdbca495d6e
2016-05-10 21:36:58 +00:00
Adam Powell
56e2aeba8f Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev 2016-05-10 21:34:29 +00:00
Antonio Cansado
f8be7f2a5d Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: 7598ac2aa7
am: 8b2dd44f2f

* commit '8b2dd44f2f30a9dd22799ee30dd4b9c5a093aae5':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ie6455799758f0bdb67440f72c266effaf412e22f
2016-05-10 21:14:09 +00:00
Antonio Cansado
7598ac2aa7 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
2016-05-10 21:05:17 +00:00
Winson
7c40291b0a Reducing the number of recent tasks we keep.
- This should decrease the time it takes to fetch the recent task list,
  and also reduce the number of tasks we store on-disk.
- Since a user can still open a fair number of tasks within the 
  time-window, and this list includes tasks that are excluded from the 
  UI, we are just reducing it to about half for the time being.

Bug: 28318359
Change-Id: Ie21b3d3d09a567007015fbbecaf914123c71cc06
2016-05-10 21:01:33 +00:00
Antonio Cansado
6965c1869a Addressing API council comments on NetworkStatsManager.
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
2016-05-10 13:24:16 -07:00
Andreas Gampe
452426b25f Merge "Frameworks/base: Shorten system property" into nyc-dev am: a8f51e3e46 am: ddaeb30d5b
am: 962906b6b7

* commit '962906b6b778f098e08cddbdffd81cc740f098ba':
  Frameworks/base: Shorten system property

Change-Id: Ieb6d2d33973f7150c0424fabac48573c18bb2dc3
2016-05-10 20:08:15 +00:00
Andreas Gampe
ddaeb30d5b Merge "Frameworks/base: Shorten system property" into nyc-dev
am: a8f51e3e46

* commit 'a8f51e3e46c705b0477bf20a8e417ab57e09afee':
  Frameworks/base: Shorten system property

Change-Id: I9e90c9ed260cd74f1585d5851c65a6c78f245daf
2016-05-10 20:02:44 +00:00
Andreas Gampe
a8f51e3e46 Merge "Frameworks/base: Shorten system property" into nyc-dev 2016-05-10 19:55:43 +00:00
Andreas Gampe
eff0639345 Frameworks/base: Shorten system property
Otherwise it's too long.

Bug: 26877591
Change-Id: I741186a9fbea6ee50df6cef58d528ec58662c772
2016-05-10 12:52:53 -07:00
Dimitry Ivanov
a0722ef1f1 Merge "Simplify permitted-path construction" into nyc-dev am: 6e2b3d158a am: 22c0dcc253
am: 8176ea65a5

* commit '8176ea65a53aac9d89b4a4c901a6fdbc9287f050':
  Simplify permitted-path construction

Change-Id: I1d12891cc29efa58924487f0cc30ea2f50d2c416
2016-05-10 19:30:55 +00:00
Dimitry Ivanov
22c0dcc253 Merge "Simplify permitted-path construction" into nyc-dev
am: 6e2b3d158a

* commit '6e2b3d158a333b8754854314af0fc865a1f8bc5e':
  Simplify permitted-path construction

Change-Id: Ib3c67e6fd52ea847a194dfd3737c9cf2c75e17b7
2016-05-10 19:25:33 +00:00
Amith Yamasani
4f128e4d96 Fix multi-window assiststructure trashing
When multiple activities within the same process
try to handle requests for AssistStructure, the
singleton mLastAssistStructure tends to trash
the old structure when a second window's request
comes in.

This change passes in a sessionId so that the
cache is only cleared if the session id changes.

Bug: 28348867
Change-Id: I07efcd933db7e48aefd25a1c95493b71bbcffe4b
2016-05-10 12:17:51 -07:00
Dimitry Ivanov
eb96b00382 Simplify permitted-path construction
The white list of permitted directories is applied for every
classloader namespace by libnativeloader. LoadedApk no longer
needs to do that.

Add mDataDir to permitted paths in the case if for any reason
it is outside of the whitelisted dirs.

Bug: http://b/28639227
Change-Id: I5b61ac64e281ecee3e3e9b1fe56cf04dc6ee7b25
2016-05-10 10:51:40 -07:00
Andreas Gampe
1ee671625a Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev am: a2723ca88c am: 2f67d686eb
am: 57cafdb556

* commit '57cafdb5563742c812fcd75856b7e556fc32f13a':
  Frameworks/base: Make profile buffer adjustable

Change-Id: Iec52411214a8688dcb8c4385ba0f5a2ff6f1dabe
2016-05-10 04:41:23 +00:00
Andreas Gampe
2f67d686eb Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev
am: a2723ca88c

* commit 'a2723ca88c630f62ac413e562fe335b5fc623f1c':
  Frameworks/base: Make profile buffer adjustable

Change-Id: Ica4a50834a2b1da2644e85d28ee1e7196c3feb2b
2016-05-10 04:30:22 +00:00
Andreas Gampe
0f03a01ca3 Frameworks/base: Make profile buffer adjustable
Add a debug system property to change the profile buffer size.

Bug: 26877591
Change-Id: Idd13f2bc6563fd88daadd1d6679f3243dab1a0ef
2016-05-09 21:05:12 -07:00
Adam Powell
858cf036a3 Move Activity multi-window event logic out of the public methods
Move the logic for dispatching multi-window mode change events to
fragments and the activity window out of the public API onFoo methods
meant to be overridden by apps. This prevents problems if an extending
class forgets to call super.onFoo in these methods and removes the
need for doing so.

Bug 28667205

Change-Id: Ibf4c543e22b95753e1e4812bbd3e81f7648de54d
2016-05-09 15:45:37 -07:00
Svetoslav Ganov
c5edb1f7cf Merge "Properly map runtime permissions to app ops" into nyc-dev am: ba83e90e18 am: 9c67138250
am: 01e9b7eb7e

* commit '01e9b7eb7ecaade7b1b9635548aba4bbdfb1f5f4':
  Properly map runtime permissions to app ops

Change-Id: I12c96c47e674062ae678e69c5d1a44ca3fcb8009
2016-05-06 23:29:50 +00:00
Svetoslav Ganov
01e9b7eb7e Merge "Properly map runtime permissions to app ops" into nyc-dev am: ba83e90e18
am: 9c67138250

* commit '9c67138250bf7803b2af0687ff9bc24300e64d5b':
  Properly map runtime permissions to app ops

Change-Id: Ia2e95c77abd18890cd1fe26d37fd70d3fc36d748
2016-05-06 23:23:14 +00:00
Svetoslav Ganov
d0e3d18b7f Merge "Properly map runtime permissions to app ops" into nyc-dev
am: ba83e90e18

* commit 'ba83e90e1825f3e40a16370babc83b8ac0645cf9':
  Properly map runtime permissions to app ops

Change-Id: Ied52aa9c152429092f3c9f3e93b79b5e58c27cac
2016-05-06 23:17:53 +00:00
Svetoslav Ganov
ba83e90e18 Merge "Properly map runtime permissions to app ops" into nyc-dev 2016-05-06 23:08:31 +00:00
Christopher Tate
d74587fb4c Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev am: 0588954071 am: 2591ee2b0b
am: ad2b44c8c7

* commit 'ad2b44c8c7907a971e7437c5ccd0f823caec53fd':
  Move the 'pretend idle jobs can run now' broadcast into AMS

Change-Id: I50b6ca257b7995d6a50fe938f8d4c788f739001a
2016-05-06 21:53:58 +00:00
Christopher Tate
2591ee2b0b Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev
am: 0588954071

* commit '058895407140de0e513b82150c3acb6131e971a2':
  Move the 'pretend idle jobs can run now' broadcast into AMS

Change-Id: Id8bd50f0a5f6d46cf60dea690803081515cb21c3
2016-05-06 21:42:47 +00:00
Chris Tate
0588954071 Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev 2016-05-06 21:34:52 +00:00
Wale Ogunwale
e87b575046 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e am: d9125edb98
am: 94d93dd38f

* commit '94d93dd38fbab0ff8f9a9ce397a522cf2fcd6429':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: Iaaf1dc4cd6f4008bf4bc571bb70365d431ea30ed
2016-05-06 18:54:56 +00:00
Wale Ogunwale
d9125edb98 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
am: 5d6a218d9e

* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I4bf1ef48aef928e12d7dbb9faa6c4e0d489acadb
2016-05-06 18:42:09 +00:00
Christopher Tate
27d92e4e39 Move the 'pretend idle jobs can run now' broadcast into AMS
It's a protected broadcast, so sending it directly from 'am' is
no longer an option.  This is needed for CTS as well as being
generally useful during app development.

Bug 28406044

Change-Id: I101915a8c6f19454330a8db2079a75023c112582
2016-05-06 11:25:11 -07:00
Wale Ogunwale
9973294080 Dismiss docked stack if an activity is shown on top of the lock screen
It is risky/complicated to try to put the activity showing on-top of
the lock screen in the right fullscreen configuration with the current
architecture. So, we just dismiss for now.

Bug: 28195260
Change-Id: I29a0350993ce8fe548d4a465b06d877cde151c78
2016-05-06 10:13:14 -07:00
Svetoslav Ganov
eaca4c5022 Properly map runtime permissions to app ops
The code assumed mapping from a permission to an app op
is one to one but this is not always the case. For example,
READ_SMS is mapped to OP_READ_SMS and OP_READ_ICC_SMS which
resulted mapping the READ_SMS permission to the OP_READ_ICC_SMS
instead of OP_READ_SMS resulting in a failure to find the op
name given the permission.

This breaks the AppOpsManager.permissionToOp() API for READ_SMS
returning null instead of OPST_READ_SMS. The consequence of this
is that the apps that proxy permission protected operations may
let the operations for READ_SMS go through as they would get a
null app op, i.e. no app op while there is one and it can be
disabled for the caller.

bug:28620132

Change-Id: I92f8ef375ae2122b7266c50653ce73f3d90f4b28
2016-05-05 18:21:09 -07:00
Adam Lesinski
0061228b4b Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd am: 3297250b9c
am: 77acaf86b3

* commit '77acaf86b36635e0d3d4470e4e38cc2ffc0c0e78':
  Fix issue where existing Activity Resources references would not update

Change-Id: I8e4b607b1ae5339ef727563d162045376dbb255b
2016-05-05 23:44:57 +00:00
Adam Lesinski
3297250b9c Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1b411b89dae0aa623d796ab2ab7dabb52a6e28c0
2016-05-05 23:35:31 +00:00
Vladislav Kaznacheev
70400ba52e Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 am: f1febf2700
am: cae475563a

* commit 'cae475563aa1c5bd9aa38f3e8ef6f88a7b3ad00f':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I462fc13ea64f72cfbf620f473f8d55d9a532eb24
2016-05-05 23:26:33 +00:00
Adam Lesinski
c1ff12eccd Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 2016-05-05 23:23:43 +00:00
Vladislav Kaznacheev
cae475563a Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571
am: f1febf2700

* commit 'f1febf27006a98adc5de584e7703338b85208ed3':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I13c413b1f0520262c271a397751a1a055e464655
2016-05-05 23:21:04 +00:00
Vladislav Kaznacheev
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
2016-05-05 23:16:04 +00:00
Adam Lesinski
8ce4e12c73 Fix issue where existing Activity Resources references would not update
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.

However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.

This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.

Bug:27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
2016-05-05 23:08:09 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Christopher Tate
c857689c75 Correct docs about what is ignored in full-data backup am: c5be8f8a4b am: 3f0db943c5
am: fb74b50b19

* commit 'fb74b50b1997123332f8d29bb4ec4487c9bcaab8':
  Correct docs about what is ignored in full-data backup

Change-Id: I5ce7df7cf12f60948739525b36ef8047a669fd70
2016-05-05 22:41:41 +00:00
Christopher Tate
fb74b50b19 Correct docs about what is ignored in full-data backup am: c5be8f8a4b
am: 3f0db943c5

* commit '3f0db943c589738fc09e7bb45c10a319b41955fa':
  Correct docs about what is ignored in full-data backup

Change-Id: I00bb2ffdb52af988d9b7c231864b629fb2e27dbd
2016-05-05 22:36:42 +00:00