Ben Gruver
bb12a413db
am 552edb89: am 51fbaff1: Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
...
* commit '552edb895a17c8cd1d6b653cbe206aa612a6f43c':
DEFAULT_VERIFY_ENABLE turns verification off
2012-09-17 11:29:17 -07:00
Jeff Sharkey
67bbcd036a
am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
...
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
Actually move to Global settings.
2012-09-17 11:10:16 -07:00
Christopher Tate
28983b10ab
am e9431fa8: am ce18d1c8: Merge "Get correct user\'s package info during clip processing" into jb-mr1-dev
...
* commit 'e9431fa8815ebd9887482a6b2848188d2786279b':
Get correct user's package info during clip processing
2012-09-17 11:10:11 -07:00
Jeff Sharkey
ddf93f9503
am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
...
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
Move to Global.NETSTATS and Global.NTP constants.
2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8
am e98aef73: am f229e4d3: Add support for settings for lock widgets
...
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
Add support for settings for lock widgets
2012-09-17 11:09:55 -07:00
Michael Jurka
a5ad62adfa
am 0cae2597: am ad92ce85: Merge "Fix bug with getting widget categories" into jb-mr1-dev
...
* commit '0cae2597b21a266862bd0fdcbf12a6133d393c2c':
Fix bug with getting widget categories
2012-09-17 11:09:40 -07:00
Kenny Root
11af0000ef
am 28c709d3: am a96fa35e: Merge "Don\'t prematurely delete temporary files" into jb-mr1-dev
...
* commit '28c709d35ecc141162c1e024022dd44553b9cc43':
Don't prematurely delete temporary files
2012-09-17 10:28:49 -07:00
Ben Gruver
51fbaff11c
Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
2012-09-14 14:01:37 -07:00
Jeff Sharkey
04a34b3755
Merge "Actually move to Global settings." into jb-mr1-dev
2012-09-14 13:49:24 -07:00
Jeff Sharkey
e6e6197d7c
Actually move to Global settings.
...
Also add better ConnectivityService logging.
Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Christopher Tate
ce18d1c871
Merge "Get correct user's package info during clip processing" into jb-mr1-dev
2012-09-14 13:44:52 -07:00
Christopher Tate
ad9833a77f
Get correct user's package info during clip processing
...
Also clear the binder identity correctly for purposes of doing
that query.
Bug 7162477
Change-Id: Ie9e43a2d8fc964d1be649887905244dcceaa3c80
2012-09-14 13:43:16 -07:00
rich cannings
e4bf0eae06
DEFAULT_VERIFY_ENABLE turns verification off
...
When DEFAULT_VERIFY_ENABLE == false, package verification must be completely
off.
Bug: 7132197
Change-Id: Icc0dbb4a3f4f5f00ddadecda6cc42976618c4332
2012-09-14 13:40:30 -07:00
Jeff Sharkey
a043c2c053
Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
2012-09-14 13:15:16 -07:00
Jeff Sharkey
023c05a341
Move to Global.NETSTATS and Global.NTP constants.
...
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Jim Miller
f229e4d3eb
Add support for settings for lock widgets
...
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Michael Jurka
ad92ce8517
Merge "Fix bug with getting widget categories" into jb-mr1-dev
2012-09-14 12:21:54 -07:00
Michael Jurka
ca5e341574
Fix bug with getting widget categories
...
Change-Id: I3b0f410707d37436732c45b572c2f588427a784f
2012-09-14 12:18:51 -07:00
Kenny Root
0b2fa8ca22
Don't prematurely delete temporary files
...
When verification and encryption is used, the temporary file was deleted
prematurely.
Also, on next boot-up, scan the directory we use for temporary files to
clean them up if the user rebooted in the middle of installation.
Bug: 7132197
Change-Id: Ic9e8aab9a664ca00d9ac16f72e53fc43d78d21bc
2012-09-14 10:34:21 -07:00
Jeff Brown
591ef1c7f7
am 5a5f08bb: am 44015010: Merge "Eat copy pasta." into jb-mr1-dev
...
* commit '5a5f08bb0400f14e1a700ba51a6e027fbd09ba9c':
Eat copy pasta.
2012-09-14 10:29:45 -07:00
Jeff Brown
626ffca210
am ee64719c: am 3a1136ee: Merge "We don\'t need black frames for forced display size." into jb-mr1-dev
...
* commit 'ee64719cdf2a55a87ad54e2c58911f3d50bc0251':
We don't need black frames for forced display size.
2012-09-14 10:29:20 -07:00
Craig Mautner
cb099ff38d
am 1e13e3c8: am 4796dfd9: Merge "Improve debug output." into jb-mr1-dev
...
* commit '1e13e3c87e5b2ed9cdfeeada022843ae748187b8':
Improve debug output.
2012-09-14 10:28:29 -07:00
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
44015010ac
Merge "Eat copy pasta." into jb-mr1-dev
2012-09-13 19:26:46 -07:00
Jeff Brown
5380a064c3
Eat copy pasta.
...
Change-Id: I74cbad279c15f1999cc68d732fc04d6c448b5c39
2012-09-13 19:24:57 -07:00
Jeff Brown
3a1136eeeb
Merge "We don't need black frames for forced display size." into jb-mr1-dev
2012-09-13 18:55:32 -07:00
Craig Mautner
4796dfd92c
Merge "Improve debug output." into jb-mr1-dev
2012-09-13 16:35:56 -07:00
Craig Mautner
dc5a6384e7
Improve debug output.
...
Change-Id: I94f46e1e373dc9e67bfbc1d1847399c119ec2fcb
2012-09-13 16:34:41 -07:00
Jeff Brown
76a3cb9773
We don't need black frames for forced display size.
...
Now that surface flinger lets us set a display projection,
the window manager no longer needs to place a black frame
around the content when simulating a different display size.
Bug: 7139798
Change-Id: I6014390f47444633d434ccf918cee5ff7b502869
2012-09-13 16:02:10 -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