20303 Commits

Author SHA1 Message Date
Christopher Tate
b541f09be3 Merge "Fix crash in KeySet dump" into lmp-dev 2014-09-03 23:33:05 +00:00
Svetoslav
9bf08c7bc1 Clear binder identity when sending window change accessibility events.
We get calls for window changes from the window manager and
as a result send accessibility events for these changes. It
is possible that the call for a windows change from the window
manager comes as a result of an unprivileged client calling
into the window manager. However, the event sending code
is performing security checks.

bug:17364244

Change-Id: Ief016f9dafd13ac35418676817848b3ea3ed4d66
2014-09-03 16:29:35 -07:00
Christopher Tate
6441bc7e53 Fix crash in KeySet dump
This was unfortunately DOSing some important parts of the Package
Manager's dumpsys output.

Change-Id: I228f23e8e26820b40a8d8772cd5f5b04ee8317d9
2014-09-03 16:11:31 -07:00
Yuncheol Heo
aa6a67a3e1 Merge "Invoke the callback only when DeviceInfo is available." into lmp-dev 2014-09-03 22:41:43 +00:00
Christopher Tate
835b313fa8 Merge "The transport system API needs to manage binder identity" into lmp-dev 2014-09-03 21:33:03 +00:00
Christopher Tate
539b217b76 The transport system API needs to manage binder identity
...around writing settings.  It does its own proper permission check;
it just needs to make sure not to accidentally crash the caller in
strange and wondrous ways because of failing to clear binder identity
before writing the result to secure settings.

Bug 16542048

Change-Id: I88d1f2dbeebd24eed5d86989f0ca0d834878b054
2014-09-03 14:12:11 -07:00
Marco Fucci
8364885a7d Merge "Disconnect TrustAgent when not active." into lmp-dev 2014-09-03 20:39:05 +00:00
Amith Yamasani
bef1036af7 Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 2014-09-03 20:26:10 +00:00
Nick Kralevich
fe0fed54a4 am ad0a66ac: am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests""
* commit 'ad0a66acf4a28646bd1a0060736cdb8e7d9712a4':
  Revert "SELinuxMMAC unit tests"
2014-09-03 20:20:34 +00:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Amith Yamasani
0e8d7d63ba Add some @SystemApi tags for internal user-related APIs
Also added an internal isManagedProfile()

Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
2014-09-03 13:17:28 -07:00
Nick Kralevich
ad0a66acf4 am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests""
* commit 'c1ce74cab0e83d574df1bd7bb7b7eb16eec171f6':
  Revert "SELinuxMMAC unit tests"
2014-09-03 20:14:31 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project).
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
2014-09-03 13:11:56 -07:00
Nick Kralevich
01a5aa95d9 Revert "SELinuxMMAC unit tests"
Broken build.

frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:89: error: constructor PackageParser in class PackageParser cannot be applied to given types;
        PackageParser packageParser = new PackageParser(archiveFilePath);
                                      ^
  required: no arguments
  found: String
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:93: error: method parsePackage in class PackageParser cannot be applied to given types;
        PackageParser.Package pkg = packageParser.parsePackage(sourceFile,
                                                 ^
  required: File,int
  found: File,String,DisplayMetrics,int
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:99: error: incompatible types
        boolean savedCerts = packageParser.collectCertificates(pkg, 0);
                                                              ^
  required: boolean
  found:    void
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
3 errors
make: *** [out/target/common/obj/APPS/FrameworksServicesTests_intermediates/classes-full-debug.jar] Error 41

This reverts commit 2f446561f2f6d1b320b34432854d2f55e5b56f9e.

Change-Id: I0aa992d7b9eccce7e38c430a8a96084a6ee99866
2014-09-03 20:03:17 +00:00
Brian Carlstrom
e7a2138635 Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 2014-09-03 20:02:42 +00:00
Marco Fucci
4e68f11672 Disconnect TrustAgent when not active.
Bug: 17191952
Change-Id: I470261f659a573400b2eb1421eeb953c87e58b66
2014-09-03 12:24:22 -07:00
Paul Jensen
1f0ce33821 Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 2014-09-03 19:08:16 +00:00
Brian Carlstrom
230561eef4 Restrict lazy dexopt to eng builds only
Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
2014-09-03 11:59:38 -07:00
Matthew Williams
61dd95f7ba am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev
* commit '3e3a7489f074b5f2234d32499cdf229da6562d46':
  Add timeout when waiting to bind to JobService
2014-09-03 18:14:26 +00:00
Nick Kralevich
01168beebc am 7f534190: am 3d4cfc04: Merge "SELinuxMMAC unit tests"
* commit '7f534190d629ac21adce0b3f3f74597e63cd3238':
  SELinuxMMAC unit tests
2014-09-03 18:08:31 +00:00
Jason Monk
37a5bd8be8 am 874fff78: am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev
* commit '874fff781a60f77b7df030d932c4fb340086368d':
  Add lock task checking to moving tasks to back
2014-09-03 18:01:30 +00:00
Nick Kralevich
7f534190d6 am 3d4cfc04: Merge "SELinuxMMAC unit tests"
* commit '3d4cfc04a7bc882d534a49dfb475180907fcf842':
  SELinuxMMAC unit tests
2014-09-03 18:01:15 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Craig Mautner
4f321d86a5 am d1a438b3: am f17528b5: Merge "Unconditionally move stack to front." into lmp-dev
* commit 'd1a438b37c01b8b39c9073db3649fb6221027c61':
  Unconditionally move stack to front.
2014-09-03 17:48:18 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
2014-09-03 10:47:27 -07:00
Jason Monk
327f7ebc01 Merge "Add lock task checking to moving tasks to back" into lmp-dev 2014-09-03 17:41:41 +00:00
Esteban Talavera
6bf9c6350a am 67330f8c: am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev
* commit '67330f8c077570c870846b7618b5196827483c84':
  Pass ComponentName to probing certificate methods
2014-09-03 17:37:01 +00:00
Craig Mautner
db606d2b28 Merge "Unconditionally move stack to front." into lmp-dev 2014-09-03 17:35:19 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Jason Monk
a7a61594df Add lock task checking to moving tasks to back
Chrome seems to use this method of moving itself to the back on
back presses, causing it to escape lock task mode.

Bug: 17365048
Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
2014-09-03 13:17:05 -04:00
Craig Mautner
02a4aa261c Unconditionally move stack to front.
Recents was depending on using moveTaskToFront() to also move the
task's stack to the front. But that only works if the task is
actually in the stack because moveTaskToFront() doesn't do the
stack movement if the task is no longer in the stack. This change
calls ActivityStack.moveToFront() in addition to moveTaskToFront().

Fixes bug 17361027.

Also logs callingUid when starting an activity.

Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
2014-09-03 10:03:57 -07:00
Jason Monk
c55d9bb774 am f179010b: am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev
* commit 'f179010b8bedd9c018d0ba6991db9331efaa4153':
  Enforce permissions on start/stopLockTaskModeOnCurrent
2014-09-03 14:56:50 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
2014-09-03 14:34:47 +00:00
Dianne Hackborn
d52184d170 am 3364a9f9: am d136d986: Add more slow execution logs.
* commit '3364a9f92e7acbf3cc43c036d51056ac51e4226e':
  Add more slow execution logs.
2014-09-03 14:34:10 +00:00
Dianne Hackborn
49aa4b60e0 am fd4fcdb7: am 8b88d87e: Merge "Revert "And yet more logging for slow execution."" into lmp-dev
* commit 'fd4fcdb7e1b6579559cb15db4204ac704c2c7773':
  Revert "And yet more logging for slow execution."
2014-09-03 14:34:05 +00:00
Jason Monk
cc1f2c08e3 Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 2014-09-03 12:59:35 +00:00
Robert Craig
2f446561f2 SELinuxMMAC unit tests
Added unit tests to help with future integration and regression
testing.

Change-Id: I5e7d709e80ccbbe1dde1dc26b3e9a155f5009ad1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-09-03 08:05:40 -04:00
Esteban Talavera
808f6ef2ac Pass ComponentName to probing certificate methods
Pass ComponentName and check whether that admin is a profile owner on DPM
get/has certificate methods (requested on the API review).

As per Change I55eec17e01489ab323f8a0e68b11592605a7b740, not keeping track of
which admins installed which certificates for now:

"Having per-admin CA certificates would be a fair bit of work. The only MDMs
we're opening this up to for now are Device and Profile Owners which 100%
manage the profile so will be the only admin.
It seems like if we keep track of "who installed which certs" it'll be a little
pointless because the answer will always be "the ProfileOwner" for every single
one."

Bug: 17005622
Change-Id: I45e9dac5236ab4ed235a341c208ac3cb6aba17da
2014-09-03 11:50:55 +00:00
Yuncheol Heo
7c5d31ea93 Invoke the callback only when DeviceInfo is available.
- There is possibility that DeviceInfo can be null when unplugging MHL cable,
  if the capability register event is missed. and we should not invoke
  the callback in this case.
- In addition, we'd better use the portId of HdmiMhlLocalDevice directly,
  not one of DeviceInfo.

Bug: 17366541
Change-Id: I40d71e27d82c5f3a4c7aabda32119856c0bde83d
2014-09-03 17:03:42 +09:00
Lorenzo Colitti
e21b564168 Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev 2014-09-03 06:27:12 +00:00
RoboErik
951ed1c866 am 720c772a: am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev
* commit '720c772a481915540a189afc8ba243af5a817f0d':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
2014-09-03 06:13:11 +00:00
Dianne Hackborn
6bffbe8618 am 7f68e1ae: am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev
* commit '7f68e1ae893822b70c2a820dee0b55decaea7c37':
  And yet more logging for slow execution.
2014-09-03 05:49:31 +00:00
Lorenzo Colitti
e7cd2f5515 am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
* commit '4c172753f892557175ecb4c3cf4ed6fd76227049':
  Pass the socket mark for DNS queries to dnsmasq.
2014-09-03 05:49:22 +00:00
Craig Mautner
55ec668ec3 am 183de81a: am 2d94c706: Merge "Account for scaling effects when cropping" into lmp-dev
* commit '183de81a6cf0c4e45f1fb576cd0da06636ea8336':
  Account for scaling effects when cropping
2014-09-03 05:48:43 +00:00
Shri Borde
55100d0ad7 am be2ea906: am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev
* commit 'be2ea906d9ccb51bb9c188e868ae0297c1f25923':
  Bug 17243357: Remove MessagingConfigurationManager
2014-09-03 05:48:25 +00:00
Svetoslav
f0e57e10ed Merge "Fix AccessibilityNode's isVisibleToUser behavior." into lmp-dev 2014-09-03 03:14:12 +00:00
Dianne Hackborn
a42c0de977 Add more slow execution logs.
This time *without* mixing in an bunch of unintentional reverts!

Change-Id: Iab4cb9eb6d475d9fe5ebe16e9ea4be24c6f312e8
2014-09-03 01:18:54 +00:00
Dianne Hackborn
39a59eb1af Merge "Revert "And yet more logging for slow execution."" into lmp-dev 2014-09-03 01:09:39 +00:00
Dianne Hackborn
1257e82b94 Revert "And yet more logging for slow execution."
This reverts commit 113390ac113083884b6f498424b3f6afa2df4ebc.

Change-Id: I16fdb08f83ad31c10d943862bae639f622542339
2014-09-03 01:09:21 +00:00