summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Collapse)AuthorAgeFilesLines
* am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for ↵TK MUN2011-06-061-2/+2
|\ | | | | | | | | | | | | tethering upstream interface selection * commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006': Allow control over search order for tethering upstream interface selection
| * am cecb710a: am 94260caf: Allow control over search order for tethering ↵TK MUN2011-06-061-2/+2
| |\ | | | | | | | | | | | | | | | | | | upstream interface selection * commit 'cecb710a6de249a3847da2f07464a1aecf9459ac': Allow control over search order for tethering upstream interface selection
| | * am 94260caf: Allow control over search order for tethering upstream ↵TK MUN2011-05-251-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | interface selection * commit '94260caf2fb3f5dbf6e17b29a269b46ea05f8680': Allow control over search order for tethering upstream interface selection
| | | * Allow control over search order for tethering upstream interface selectionTK MUN2011-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If02c9b2bb61b68ebafafadc23ba17a332bc8004f Signed-off-by: TK MUN <tk.mun@samsung.com>
| * | | am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for ↵Andy Stadler2011-06-031-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getStorageEncryption()" into honeycomb-mr2 * commit 'c22d145a9f26314e23ea678e96766755268e878b': DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
| | * \ \ am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for ↵Andy Stadler2011-06-031-3/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getStorageEncryption()" into honeycomb-mr2 * commit '3148557c42aaa8abf4001dc6fd759e911ba55280': DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
| | | * \ \ Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" ↵Andy Stadler2011-06-031-3/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | | DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()Andy Stadler2011-06-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a copy/paste typo, getStorageEncryption() was protected by getActiveAdminForCallerLocked(), which made the API unreadable if the caller is not an admin. This doesn't match the rest of the DPM API which allows the "get" calls to be made anonymously. This fix supercedes the proposed workaround CL in the DPM ApiDemo sample. Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9 Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
* | | | | | | Fixing a bug I introduced during my last merge.Svetoslav Ganov2011-06-031-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6474ca94a6ef9bd17a5670a4baa51673f3c2f5d0
* | | | | | | Merge "Respect android:allowBackup="false" during full backup & restore"Christopher Tate2011-06-031-21/+118
|\ \ \ \ \ \ \
| * | | | | | | Respect android:allowBackup="false" during full backup & restoreChristopher Tate2011-06-031-21/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Packages with this manifest attribute set 'false' will not be backed up even through the "full device backup" infrastructure. If someone produces an apparent restore file with data for such an application, it will not actually be restored onto the device. When an apk is installed during the course of a restore operation, it is validated against the manifest contents and deleted if there is a mismatch. Also, if the newly-installed app is found to disallow backups, no file content will be processed for that app. Bug 4532159 Change-Id: I59630054584b1394e567de939192e22e597044ee
* | | | | | | | resolved conflicts for merge of ca2b552d to masterJeff Brown2011-06-032-2/+59
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
| * | | | | | | am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." ↵Jeff Brown2011-06-022-2/+59
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'c8812761609e532cceb400b112ed9982149c2490': Add a preference panel for mouse speed.
| | * | | | | | am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-022-2/+59
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit 'e1718de61c20c8d401633f83589f18d2c0c652db': Add a preference panel for mouse speed.
| | | * | | | | Add a preference panel for mouse speed.Jeff Brown2011-06-022-2/+59
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4124987 Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
* | | | | | | am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-031-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3a80c50485809fe72d6de83dacad494c5e84ed24': Work around OpenFeint bug.
| * | | | | | am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-011-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202': Work around OpenFeint bug.
| | * | | | | am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-011-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e66763516a9c27c192adaba417616371a1c3c9bf': Work around OpenFeint bug.
| | | * | | | Work around OpenFeint bug.Dianne Hackborn2011-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8320e50bb63fc56dc0118d5c8e9e328dbd3fcb1
* | | | | | | am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml ↵Dianne Hackborn2011-06-036-13/+33
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources used for homescreen widgets." into honeycomb-mr2 * commit '7322e557cfe42da42779625d69ced2db74a9df90': Fix issue #4502672: Wrong xml resources used for homescreen widgets.
| * | | | | | am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources ↵Dianne Hackborn2011-05-316-13/+33
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used for homescreen widgets." into honeycomb-mr2 * commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1': Fix issue #4502672: Wrong xml resources used for homescreen widgets.
| | * | | | | am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for ↵Dianne Hackborn2011-05-316-13/+33
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | homescreen widgets." into honeycomb-mr2 * commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d': Fix issue #4502672: Wrong xml resources used for homescreen widgets.
| | | * | | | Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." ↵Dianne Hackborn2011-05-316-13/+33
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | | | Fix issue #4502672: Wrong xml resources used for homescreen widgets.Dianne Hackborn2011-05-316-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race in the system process between applying the initial configuration and executing code in higher-level system services like the app widget service that relies on the config. For some reason it starting showing up more after my code changes; it should now be completely fixed. Also fix the activity starting window to run in compatibility mode if its application is going to be in compatibility mode. And some various cleanup and small fixes. Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
* | | | | | | | resolved conflicts for merge of 7e193916 to masterDianne Hackborn2011-06-031-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
| * | | | | | am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system ↵Jeff Brown2011-05-311-0/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration." into honeycomb-mr2 * commit '425f2a6d71b3af058630367d75b0b924bf1aee49': Use ViewConfiguration to seed input system configuration.
| | * | | | | am c272d427: Merge "Use ViewConfiguration to seed input system ↵Jeff Brown2011-05-311-0/+20
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration." into honeycomb-mr2 * commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2': Use ViewConfiguration to seed input system configuration.
| | | * | | | Merge "Use ViewConfiguration to seed input system configuration." into ↵Jeff Brown2011-05-311-0/+20
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | honeycomb-mr2
| | | | * | | Use ViewConfiguration to seed input system configuration.Jeff Brown2011-05-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where the pointer presentation would be updated on any input reader timeout rather than only when a pointer gesture is in progress. Bug: 4124987 Change-Id: Ie9bba4a0b3228d55e45e65fa2ede5cd6ba887a08
* | | | | | | am 096762d6: am 8075fe48: am 78470718: Fix various places that were using ↵Dianne Hackborn2011-06-023-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the wrong display metrics. * commit '096762d6efcae6300c02919bc6b3eaeeffccf91d': Fix various places that were using the wrong display metrics.
| * | | | | | am 8075fe48: am 78470718: Fix various places that were using the wrong ↵Dianne Hackborn2011-05-273-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display metrics. * commit '8075fe48bf345e4014de9b7bee8def5f4373457c': Fix various places that were using the wrong display metrics.
| | * | | | | am 78470718: Fix various places that were using the wrong display metrics.Dianne Hackborn2011-05-273-4/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '784707187d96b731df5256c1c2adb0aaf9037239': Fix various places that were using the wrong display metrics.
| | | * | | | Fix various places that were using the wrong display metrics.Dianne Hackborn2011-05-273-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
* | | | | | | am 9b94aa18: am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.Dianne Hackborn2011-06-025-32/+76
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9b94aa18f78e6c6281202e72b5a7451bc479fe82': Fix compat mode bugs when updating apps.
| * | | | | | am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.Dianne Hackborn2011-05-275-32/+76
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e5d377014b04022a04fd0b2b24b343d1e0ec8d2a': Fix compat mode bugs when updating apps.
| | * | | | | am 8ea5e1d7: Fix compat mode bugs when updating apps.Dianne Hackborn2011-05-275-32/+76
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d': Fix compat mode bugs when updating apps.
| | | * | | | Fix compat mode bugs when updating apps.Dianne Hackborn2011-05-275-32/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer accidentally puts an app into compatibility mode. Also various cleanup, freezing screen while switching between modes. Change-Id: Ic1b3958be7800189a93f68e9dee3c5adfc45fe57
* | | | | | | resolved conflicts for merge of 5c2e4d20 to masterDianne Hackborn2011-06-021-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
| * | | | | | am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for ↵Dianne Hackborn2011-05-261-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declaring the compatible screens." into honeycomb-mr2 * commit '8fcbfb52607263754b6d3895a112f792c5c3a12e': Add new supports-screens attributes for declaring the compatible screens.
| | * | | | | am 94250ac6: Merge "Add new supports-screens attributes for declaring the ↵Dianne Hackborn2011-05-261-2/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible screens." into honeycomb-mr2 * commit '94250ac69c6e07534e4781d3479dccb79d8c366c': Add new supports-screens attributes for declaring the compatible screens.
| | | * | | | Merge "Add new supports-screens attributes for declaring the compatible ↵Dianne Hackborn2011-05-261-2/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | screens." into honeycomb-mr2
| | | | * | | | Add new supports-screens attributes for declaring the compatible screens.Dianne Hackborn2011-05-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40d57e4354e48accc1027c9f90916ea73eb5190d android:requiresSmallestWidthDp provides the smallest supported width. android:compatibleWidthLimitDp provides the largest compatible width.
| | * | | | | | am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" ↵Kenny Root2011-05-261-45/+95
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6': Break apart queries to getInstalled* API DO NOT MERGE
| | | * | | | | Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2Kenny Root2011-05-261-45/+95
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Break apart queries to getInstalled* API DO NOT MERGEKenny Root2011-05-261-45/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid blowing past the Binder IPC limit, change the PackageManagerService to have a DB-like interaction where the client tells the service the last "row" that it read. The fact that we use a HashMap instead of a TreeMap makes this problematic. For now we're just making a new ArrayList for the keys and then sorting them for each call. This can make the API slower for callers of this, but it's probably greatly overshadowed by the cost of the data transfer itself. Bug: 4064282 Change-Id: Ia3a8cdaa94581ed9336f2e05694b8c8a5f757bce
* | | | | | | | am 469465c4: am 0821f274: am 2a108403: I am a dummy.Dianne Hackborn2011-06-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '469465c45e42c66201639feb49db5421f5843bbe': I am a dummy.
| * | | | | | | am 0821f274: am 2a108403: I am a dummy.Dianne Hackborn2011-05-261-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0821f2745d05af98195c9c1c7889ca14e9c56e0b': I am a dummy.
| | * | | | | | am 2a108403: I am a dummy.Dianne Hackborn2011-05-261-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a108403803bd30bee1c019060c208fb8c52c10c': I am a dummy.
| | | * | | | | I am a dummy.Dianne Hackborn2011-05-261-1/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Change-Id: Ie6908a8931954f83ab0e9b905173b576dbf3661d
* | | | | | | resolved conflicts for merge of 76450622 to masterDianne Hackborn2011-06-021-20/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83