Commit Graph

8525 Commits

Author SHA1 Message Date
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
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
Christopher Tate
f4f2ef5162 Correct docs about what is ignored in full-data backup
am: c5be8f8a4b

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

Change-Id: Id1618de0e4027135a320cd133c244ba33d2960aa
2016-05-05 22:31:53 +00:00
Christopher Tate
c5be8f8a4b Correct docs about what is ignored in full-data backup
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.

Bug 28321431

Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
2016-05-05 22:20:46 +00:00
Robert Carr
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac
am: 45c6eb2164

* commit '45c6eb21648f9977057471d1f41beb275512a449':
  Prepare to replace windows across recreate().

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
2016-05-05 19:57:27 +00:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
2016-05-05 09:32:27 -07:00
Rubin Xu
eae1425bf6 Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 am: b9d94a454d
am: c926f0eb0f

* commit 'c926f0eb0fbc58a53e0ffdbf0fc9a994a95e886d':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: Ic07faee56bbed2f5f18a35fc0a42e149a055961e
2016-05-05 13:22:34 +00:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
2016-05-05 13:12:45 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
2016-05-05 12:00:50 +01:00
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
2016-05-05 00:49:47 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Wale Ogunwale
d622b932fa Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp
am: c2bef7c6e2

* commit 'c2bef7c6e2eade011a73db1abd4acf2ab8b3aca7':
  Make sure to pause activity before stopping

Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6
2016-05-04 22:09:41 +00:00
Robin Lee
4632c0c9a8 Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp
am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1
2016-05-04 22:04:40 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
2016-05-04 21:41:23 +00:00
Wale Ogunwale
506a604200 Merge "Make sure to pause activity before stopping" into nyc-dev
am: 5f81a3f84c

* commit '5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
  Make sure to pause activity before stopping

Change-Id: I24e550abc72f78904d04d1c0bd2c3a004328555f
2016-05-04 20:48:54 +00:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Robert Carr
77bdfb512f Prepare to replace windows across recreate().
When the activity locally recreates itself, nothing
on the server side is able to prepare preserving windows,
or replacing windows. The activity was trying to defer
removing the old window, but it was just waiting
until the new one was created, not until it was drawn,
thus resulting in a flicker. It's easy to backpack on the
existing replacement infrastructure.

Bug: 28221875
Change-Id: I55fc4ca78e9e11809473fedd8b30b6a6350cf852
2016-05-04 12:40:39 -07:00
Robin Lee
cc1c55051c Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am: 7ec93a1ee2

* commit '7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07
2016-05-04 18:55:54 +00:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
2016-05-04 11:46:29 -07:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Amith Yamasani
f5b388c1ae Merge "Clear active requests on switching voice interactor" into nyc-dev am: ec07352007 am: ae4ecce1ef
am: 5e603c6fa0

* commit '5e603c6fa0b250f5eb0212fc78840eaa1d80007d':
  Clear active requests on switching voice interactor

Change-Id: Ied72a73f7c8a54ed20af91fa7e36da7ffe7c2ba2
2016-05-04 00:44:14 +00:00
Amith Yamasani
ae4ecce1ef Merge "Clear active requests on switching voice interactor" into nyc-dev
am: ec07352007

* commit 'ec07352007812eeb70c5f47bbac54e9816a30b55':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
2016-05-04 00:30:06 +00:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Amith Yamasani
eeed06c108 Clear active requests on switching voice interactor
When voice interactor goes null or changes, cancel all existing
active requests and clear them so that they can be re-submitted.

Bug: 28487567
Change-Id: Ibcf024efcc81ff18ef3babfa9a169292207bc816
2016-05-03 15:07:03 -07:00
Dimitry Ivanov
d9fd045ed1 Merge "Allow apps to load libraries from under /data" into nyc-dev am: a31657911c am: fde7511918
am: d66b0b16fa

* commit 'd66b0b16fa89da38a697953308517cf0560ba04b':
  Allow apps to load libraries from under /data

Change-Id: I577ab4f344c5f20e427eb644bfe0c7de224c54e3
2016-05-03 20:10:11 +00:00
Dimitry Ivanov
fde7511918 Merge "Allow apps to load libraries from under /data" into nyc-dev
am: a31657911c

* commit 'a31657911c96fb735bf4a34610638c9f95e5c99d':
  Allow apps to load libraries from under /data

Change-Id: I2bfbd50d911857825f9b8060a3ebdb335ff7cfad
2016-05-03 20:05:27 +00:00
Dimitry Ivanov
a31657911c Merge "Allow apps to load libraries from under /data" into nyc-dev 2016-05-03 20:00:39 +00:00