Commit Graph

11074 Commits

Author SHA1 Message Date
David Christie
f63d3c64cb am e8ae4eaf: am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-de
* commit 'e8ae4eafea69ccdffd91865f46ee2d569cdc1203':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
2013-04-15 21:54:47 -07:00
Dianne Hackborn
11dfb30c2f am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit 'f5cfab41c3ea1eb0cd99f7a9387af7df2b2e5991':
  Fix issue #8512015: VideoView's window animates when its position changes
2013-04-15 21:54:39 -07:00
David Christie
e8ae4eafea am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev
* commit 'feedb1b095f94e4bd153aeee78da07d963892071':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
2013-04-15 16:39:08 -07:00
David Christie
feedb1b095 Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 2013-04-15 23:35:44 +00:00
Dianne Hackborn
f5cfab41c3 am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
2013-04-15 16:25:05 -07:00
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Geremy Condra
baa58cdb9f am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
2013-04-15 16:13:56 -07:00
Geremy Condra
bffe377bca Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 2013-04-15 23:11:12 +00:00
David Christie
1b9b7b1f1b Fix security issues with LocationManager where apps with coarse permissions
can get location updates too frequently by repeatedly calling getLastKnownLocation
or by registering/unregistering location updates frequently.

Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
2013-04-15 15:31:11 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
2013-04-15 15:07:21 -07:00
Svetoslav
1f3d844add am 7919ea98: am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
* commit '7919ea98668abe3782f00f78cc48fc1ed011c49e':
  Crash on non-eng builds due to lacking null check.
2013-04-15 15:00:00 -07:00
Svetoslav
ed8998094a am f9dd9338: am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
* commit 'f9dd9338d0849aaf9c5a4b4905a3884787685fa4':
  Fully setup newly bound service before state management.
2013-04-15 14:59:57 -07:00
Geremy Condra
f33575b05b Add logic to handle changes to file_contexts during update.
Bug: 8116902

(cherry picked from commit a2dffda3b3)

Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
2013-04-15 14:56:58 -07:00
Svetoslav
7919ea9866 am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.
2013-04-15 14:56:24 -07:00
Svetoslav
f9dd9338d0 am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
  Fully setup newly bound service before state management.
2013-04-15 14:56:21 -07:00
Svetoslav
7af3d0560d Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 2013-04-15 21:52:07 +00:00
Svetoslav
289e64974a Merge "Fully setup newly bound service before state management." into jb-mr2-dev 2013-04-15 21:51:22 +00:00
Geremy Condra
edf10b18c5 Merge "Add logic to handle changes to file_contexts during update." 2013-04-15 20:43:51 +00:00
Jeff Sharkey
ba1bd9aab2 Merge "Support persistable Uri permission grants." 2013-04-15 20:23:14 +00:00
Jeff Sharkey
328ebf2221 Support persistable Uri permission grants.
When granting a Uri permission with new PERSIST_GRANT_URI_PERMISSION
flag, persist that grant across device reboots until explicitly
revoked.  Adds new persistedModeFlags dimension to UriPermission,
and moves all flag mutation into UriPermission for clarity.  Adds
flag documentation.  Only inflate HashSet as needed.

Write persisted grants into XML file, saving based on source and
target package name and user handle.  Sanity check grants when
parsing.

Wipe all grants from/to a package when uninstalled, and wipe any
transient grants when a package or user is force stopped.

Persistable grants are always considered "needed."

Change-Id: I3f001571b498fd607456a1257a6383f904d19497
2013-04-15 12:34:40 -07:00
Geremy Condra
ebbfda9180 Merge "Revert "Add logic to handle changes to file_contexts during update."" 2013-04-15 19:30:24 +00:00
Geremy Condra
994add94c9 Revert "Add logic to handle changes to file_contexts during update."
This reverts commit 7951ceb0d1 in favor of https://googleplex-android-review.googlesource.com/#/c/296692/

Change-Id: I3df44a78f63240f79a047c04be067d9eaf85e303
2013-04-15 19:30:01 +00:00
Svetoslav
1487cd5afc Crash on non-eng builds due to lacking null check.
On eng builds we have an event consistency verifier to log any
inconsistent event stream states due to mishandling of intercepted
events by an accessibility service. On non-eng builds this verifier
is null and a null check was lacking.

bug:8616711

Change-Id: Ib083a405dfa8340025090a65e50155eb10526a90
2013-04-15 12:28:46 -07:00
Svetoslav
072906eef8 Fully setup newly bound service before state management.
If the connected service is not entirely setup when calling the method for
handling a change in the current user state we get a potential NPE since
the management method may have discarded the service, thus nullifying the
connection to it. Now the service is fully configured before calling the
state change management method.

bug:8600489

Change-Id: Ib0bf7c6d575e15c620da419d43ece22f4187fd34
2013-04-15 12:16:20 -07:00
Geremy Condra
a2dffda3b3 Add logic to handle changes to file_contexts during update.
Bug: 8116902
Change-Id: I56ad60e5e02c857d3370ec9775fd4e4480e8b458
2013-04-15 11:17:30 -07:00
Svetoslav
14210466bf resolved conflicts for merge of dd03b6dc to master
Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3
2013-04-12 18:03:50 -07:00
Svetoslav Ganov
dd03b6dcb7 am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev
* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.
2013-04-12 17:17:59 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Craig Mautner
fd7e534b1f Merge "Implement separate stacks." 2013-04-13 00:05:50 +00:00
Geremy Condra
f0dffd0ab5 Merge "Add logic to handle changes to file_contexts during update." 2013-04-12 23:48:20 +00:00
Geremy Condra
7951ceb0d1 Add logic to handle changes to file_contexts during update.
Bug: 8116902
Change-Id: I961a202f583eccd30f923c2f0882597096e8175c
2013-04-12 16:36:31 -07:00
Craig Mautner
de4ef020ec Implement separate stacks.
One for home activity(s), one for other activities. Coordination
between the stacks is handled by the ActivityStackSupervisor.

Change-Id: I11395edea501d2f84a18a6a8bced1ce3d0797dad
2013-04-12 15:45:47 -07:00
Craig Mautner
c1dedb6fc4 Merge "Prepare WindowManager for multiple stacks." 2013-04-12 22:41:36 +00:00
Craig Mautner
9903d8bf78 Merge "Separate stacks into Home and others." 2013-04-12 22:40:35 +00:00
Emily Bernier
d65b268fcd am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
  Add user restrictions (credentials, user removal)
2013-04-12 13:29:35 -07:00
Emily Bernier
9b8abb5abd am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
  Add user restrictions (credentials, user removal)
2013-04-12 13:25:58 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Adam Momtaz
8f6f1f43ee Allow for setting test type as a monkey.
1. This allows UiAutomation type tests to run as if an
   android monkey test is running. This allows applications
   that recognize that they are drive by a test framework and
   avoid performing certain actions such as calling 911.

2. Fixed a bug where the UiAutomation#disconnect() was not
   called when the instrumentation is shutdown.

bug: 8588857

Change-Id: I9e3624dfbe2b8f81f27805711de1098ea2edd03d
2013-04-12 12:54:34 -07:00
Robert Greenwalt
720471f0fd am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '2d28d6229f8cb5e158998de421ee0a0d1ff865fe':
  Add new route.hasGateway() api
2013-04-12 12:11:20 -07:00
Robert Greenwalt
2d28d6229f am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
2013-04-12 12:07:14 -07:00
Robert Greenwalt
3016244ffb Merge "Add new route.hasGateway() api" into jb-mr2-dev 2013-04-12 19:02:24 +00:00
Kenny Root
7415737326 am 12cff6f6: am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev
* commit '12cff6f6289cb6bb06b716e75e7776099343323a':
  Remove keystore entries when app data cleared
2013-04-12 12:00:59 -07:00
Kenny Root
12cff6f628 am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev
* commit '10a25c0af785ee0daa735fc9a26571fb4c27399a':
  Remove keystore entries when app data cleared
2013-04-12 11:56:53 -07:00
Robert Greenwalt
ca441ee2f0 Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
2013-04-12 11:22:52 -07:00
Kenny Root
6fd1c85d7f Remove keystore entries when app data cleared
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

Bug: 8566369
Change-Id: I201c92d0893f0d18e87970dcd59ef6cd904584dc
2013-04-12 10:09:02 -07:00
Svetoslav
3ba01a7cc3 am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
* commit '9d02928e4349cecfa14e195d3d6f40e68c5fc468':
  Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:51:09 -07:00
Svetoslav
9d02928e43 am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
* commit '14c8c741f79983578a8e9c5124d142c6d85ab91b':
  Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:48:39 -07:00
Svetoslav
14c8c741f7 Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 2013-04-12 05:45:43 +00:00
Geremy Condra
c797b40ade am 64ef8ed8: am 68913baf: Merge "Remove /data/system location for mac_permissions.xml."
* commit '64ef8ed88c435108bec7f780fb9d8378422c5751':
  Remove /data/system location for mac_permissions.xml.
2013-04-11 19:07:49 -07:00
Geremy Condra
64ef8ed88c am 68913baf: Merge "Remove /data/system location for mac_permissions.xml."
* commit '68913baf72832226c0788bdba885e92e186cc2d8':
  Remove /data/system location for mac_permissions.xml.
2013-04-11 19:05:10 -07:00