Commit Graph

8480 Commits

Author SHA1 Message Date
Jeff Brown
82904caecf am 5572f0ab: am cdfc56a3: Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev
* commit '5572f0ab75f73b3cb90de0fe00fc7f47db3df6a8':
  Add preliminary API for reporting display capabilities.
2012-09-14 10:28:09 -07:00
Victoria Lease
89ad5f4268 am d21e0140: am 1f1f5970: Merge "Require ACCESS_FINE_LOCATION for Geofence use." into jb-mr1-dev
* commit 'd21e0140d05bb3b89e41aa829f4aec0bdf7e2fc7':
  Require ACCESS_FINE_LOCATION for Geofence use.
2012-09-14 10:28:02 -07:00
Jeff Brown
67d8343f9a am 49fcac63: am 45a0b90a: Merge "Enable remote submix for wifi display." into jb-mr1-dev
* commit '49fcac63282ee9d6ac7552505aeea6be2501ee24':
  Enable remote submix for wifi display.
2012-09-14 10:27:58 -07:00
Jeff Brown
cdfc56a387 Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev 2012-09-13 15:34:51 -07:00
Victoria Lease
1f1f5970f9 Merge "Require ACCESS_FINE_LOCATION for Geofence use." into jb-mr1-dev 2012-09-13 15:32:00 -07:00
Jeff Brown
45a0b90a7e Merge "Enable remote submix for wifi display." into jb-mr1-dev 2012-09-13 15:32:00 -07:00
Kenny Root
df1a9dab51 am 871e27ea: am 24271a8c: Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev
* commit '871e27eabc626dd50191df6c3bb3350214612c9b':
  Use shared app gid for forward-locked processes
2012-09-13 14:48:25 -07:00
Kenny Root
24271a8c4c Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev 2012-09-13 14:43:20 -07:00
Victoria Lease
4fab68b532 Require ACCESS_FINE_LOCATION for Geofence use.
Bug: 7153226
Change-Id: I49236379e739fcda66bbc9a31cfdca9a87122aec
2012-09-13 14:17:41 -07:00
Kenny Root
715806aaa2 am f972f2fa: am aefd73d2: Merge "Try to avoid possible NPE" into jb-mr1-dev
* commit 'f972f2fa9682845506c6d2b9d90a9f0f65e55b33':
  Try to avoid possible NPE
2012-09-13 14:11:49 -07:00
Svetoslav Ganov
c2c09fb14b am e5448cb5: am 1803e5e5: Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev
* commit 'e5448cb5bcd1e775656e4427676414a23e8d97f4':
  Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.
2012-09-13 14:10:27 -07:00
Victoria Lease
d9aced75d0 am 30e4ab52: am e2052a33: Merge "Secure setting for LocationFudger\'s accuracy" into jb-mr1-dev
* commit '30e4ab52b4b48d8d448cba5744d33e4476fa93c1':
  Secure setting for LocationFudger's accuracy
2012-09-13 14:10:17 -07:00
Amith Yamasani
8dc793a394 am f273aeb8: am 5efc533b: Merge "Fix service binding for singleUser services" into jb-mr1-dev
* commit 'f273aeb8cccf120fa4c1da33fe77781df16afed3':
  Fix service binding for singleUser services
2012-09-13 14:04:49 -07:00
Jeff Brown
d127ac5462 am c80c7023: am fd218245: Merge "Wait for installd to finish starting before booting." into jb-mr1-dev
* commit 'c80c7023359078ad58bc958c9b5571d85aa3b4c0':
  Wait for installd to finish starting before booting.
2012-09-13 14:04:08 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
2012-09-13 10:42:22 -07:00
Kenny Root
aefd73d2b9 Merge "Try to avoid possible NPE" into jb-mr1-dev 2012-09-13 08:38:26 -07:00
Kenny Root
0f001d3ee0 Try to avoid possible NPE
For some reason .getParent() appears to be returning null for a data
directory. We don't need to use the parent; we can just use the path.

Bug: 7151733
Change-Id: I5e17cc14fe53669882329d67d8a7b4ec35b81104
2012-09-13 08:36:49 -07:00
Craig Mautner
c1bfc347ef am a937899f: am 4be29754: Merge "Rename variables and methods for clarity." into jb-mr1-dev
* commit 'a937899f72d544c338f969b99f05484e228439ff':
  Rename variables and methods for clarity.
2012-09-13 03:22:23 -07:00
Craig Mautner
5409825bc2 am 5f3bce23: am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev
* commit '5f3bce237eb9ea18999d2c51b4cc3050a33541e8':
  Only consider hiddenRequested when deciding layout
2012-09-13 03:21:59 -07:00
Svetoslav Ganov
1803e5e5c7 Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev 2012-09-12 20:34:09 -07:00
Svetoslav Ganov
19f4a29fa4 Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.
1. This change enforces an accessibility service to require the system
   defined BIND_ACCESSIBILITY_SERVICE permission.

bug:6507771

Change-Id: If5e16bb4fa97891be0ccbb35e343773712e33b98
2012-09-12 20:26:30 -07:00
Victoria Lease
e2052a33f6 Merge "Secure setting for LocationFudger's accuracy" into jb-mr1-dev 2012-09-12 19:03:04 -07:00
Amith Yamasani
5efc533be6 Merge "Fix service binding for singleUser services" into jb-mr1-dev 2012-09-12 18:25:20 -07:00
Amith Yamasani
4076bc5046 Fix service binding for singleUser services
Bug: 7137147

No need to try to retrieve the service again as user 0.

Change-Id: I910aca3fae91dc709ef2265ed0fce09f46f5b769
2012-09-12 18:19:40 -07:00
Geremy Condra
7c65e39964 DO NOT MERGE Added event logging for config installation failures.
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.

Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65
2012-09-12 17:54:04 -07:00
Geremy Condra
755b877423 DO NOT MERGE Create intermediate directories when installing config data.
This prevents an issue where a user factory data resets and
hoses the default directory layout- it will now be recreated
on first update.

Change-Id: I7e3cb47a0fa3aa941a74d46fba7e15865484b66d
2012-09-12 17:53:59 -07:00
Geremy Condra
b631084613 DO NOT MERGE Add components for the Android Config Updater to system server.
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
2012-09-12 17:53:53 -07:00
Jeff Brown
fd218245d2 Merge "Wait for installd to finish starting before booting." into jb-mr1-dev 2012-09-12 17:06:45 -07:00
Victoria Lease
df9ec6171f Secure setting for LocationFudger's accuracy
This replaces the ACCURACY_METERS constant and all derived values with
a secure setting. This value defaults to 2km and has a hardcoded floor
of 500m.

Bug: 6982024
Change-Id: Ibf97ab57145abf28c4a9747444f40250adddf23c
2012-09-12 17:06:07 -07:00
rich cannings
3361340d9f am e88d6950: am 4a86019a: Temporarily turn off package verification
* commit 'e88d69508ba76150850947f73ec86c03269762ad':
  Temporarily turn off package verification
2012-09-12 17:03:38 -07:00
Jeff Brown
f69c812f49 Wait for installd to finish starting before booting.
Fixes a race condition where the system server might
try to access /data/user/0 before it was created.  In so
doing, the system server could end up creating a directory
in that location with the wrong permissions and everything
would promptly crash.

Bug: 7151686
Change-Id: I349c12fd2b9685d2e7f6305e74f6bf7d5816b752
2012-09-12 17:00:34 -07:00
Craig Mautner
4be2975453 Merge "Rename variables and methods for clarity." into jb-mr1-dev 2012-09-12 16:48:15 -07:00
Craig Mautner
5c0e78c445 Rename variables and methods for clarity.
Change-Id: I2a1b2f2d5605123e55f264d45b1e7292852f2a7f
2012-09-12 16:45:36 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
2012-09-12 16:34:31 -07:00
Craig Mautner
faecd09cb7 Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 2012-09-12 16:18:37 -07:00
Craig Mautner
c516a5c58f Only consider hiddenRequested when deciding layout
This change removes the test for hidden when deciding whether to
do a layout. So layout begins as soon as hiddenRequested occurs.
Since hidden is cleared when animations starts considering hidden
in the layout decision will delay layout until it is too late.

In particular we were not executing a relayout on return to an
activity even though the screen had been rotated while away.

Fixes bug 6615859.

Change-Id: I5fb0b4bf2c253b910a7a192da04419236d8f09d9
2012-09-12 16:13:59 -07:00
Jeff Brown
88469e56c8 Enable remote submix for wifi display.
Change-Id: Ib6cad4ecfed91abf835555a1089a206ee9b0763c
2012-09-12 16:03:11 -07:00
Jeff Brown
eda63986fe am 81da4c77: am c7b6ec7a: Merge "Improve reporting of wifi connection state." into jb-mr1-dev
* commit '81da4c7780134b4ed5d37872b198fb6ad01b3885':
  Improve reporting of wifi connection state.
2012-09-12 15:35:48 -07:00
Svetoslav Ganov
3acdb339ac am e020020f: am 5e900e3a: Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev
* commit 'e020020f218550c97d1011c7eb6221d14fe1ea33':
  Adding a scaling threshold in ScreenMagnifier
2012-09-12 15:35:41 -07:00
Svetoslav Ganov
f210e776a0 am 0d6e17b4: am b1ee5886: Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev
* commit '0d6e17b468f00c37025bf3a0a733a49084f7ab0b':
  Refactoring the scale and pan detection in the ScreenMagnifier.
2012-09-12 15:35:24 -07:00
Svetoslav Ganov
d381c620ed am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '2b5c5b640d170518ac9ddc289a49340e54ff39d0':
  Screen magnifier should handle window rebuilds correctly.
2012-09-12 15:34:32 -07:00
Jeff Brown
984f157366 am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
* commit '2eb82513bd448757250dc8245e9c29c747397608':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
2012-09-12 15:28:20 -07:00
Adam Cohen
3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets
2012-09-12 15:14:57 -07:00
Kenny Root
bbf4fc22f7 am dba90626: am a3618092: Merge "Remove "unlinklib" command from installd" into jb-mr1-dev
* commit 'dba90626d3e8e0a9993bbc9d30094a0764dc3f55':
  Remove "unlinklib" command from installd
2012-09-12 15:13:57 -07:00
Amith Yamasani
253730061d am 59337ae6: am 8015f039: Merge "Enforce a user limit" into jb-mr1-dev
* commit '59337ae684d62c644827d782456d659b3effcef6':
  Enforce a user limit
2012-09-12 15:13:53 -07:00
rich cannings
4a86019aee Temporarily turn off package verification
Bug: 7152858
Change-Id: Ic3b1900e486224dafcf3cce5db13e5f795650b51
2012-09-12 14:45:58 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
2012-09-12 10:55:03 -07:00
Jeff Sharkey
8b29d63d08 Merge "Include user identifier in external storage paths." into jb-mr1-dev 2012-09-11 23:36:50 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
2012-09-11 23:11:14 -07:00