summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* am "WFC configuration: add carrier and device support configurations."Vinit Deshpande2015-03-151-0/+27
|\ | | | | | | | | merged from goog/mirror-m-wireless-internal-release 9c8f21b WFC configuration: add carrier and device support configurations.
| * WFC configuration: add carrier and device support configurations.Etan Cohen2015-02-191-0/+27
| | | | | | | | | | | | Add keys for global storage of user settings. Change-Id: Ie1e31b34fa2ad5f970dcd3d97c1bfa9bd5a77427
| * am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| |\ | | | | | | | | | | | | * commit 'ffaee8bda9c8d22af17098fec0e6626301d91844': Fix NPE
* | | Properly set up local transport data dirs after an initialize operationChristopher Tate2015-03-131-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were properly setting up the underlying storage at boot time, but *not* doing so after an "initialize" operation, i.e. after wiping all of the data upon request. The effect was that after an init operation while using the local transport (e.g. if you disabled backup and then reenabled it with the local transport as your active one), full-data backup operations wouldn't work until after the next reboot. (Resubmit, with fixes, of earlier revert.) Change-Id: I745cb49b5155119d63cff6fffad5230687faca71
* | | Merge "Fix build: Revert "Properly set up local transport data dirs after an ↵Ed Heyl2015-03-131-9/+7
|\ \ \ | | | | | | | | | | | | initialize operation""
| * | | Fix build: Revert "Properly set up local transport data dirs after an ↵Ed Heyl2015-03-131-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize operation" This reverts commit dc205b3f9530ab8f25b9d8fdbe0fd942fcfc750e. Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3
* | | | Merge "Properly set up local transport data dirs after an initialize operation"Christopher Tate2015-03-131-7/+9
|\ \ \ \ | |/ / /
| * | | Properly set up local transport data dirs after an initialize operationChristopher Tate2015-03-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were properly setting up the underlying storage at boot time, but *not* doing so after an "initialize" operation, i.e. after wiping all of the data upon request. The effect was that after an init operation while using the local transport (e.g. if you disabled backup and then reenabled it with the local transport as your active one), full-data backup operations wouldn't work until after the next reboot. Change-Id: I3bfda1e94ae2312678b0bb2dde13ebdb64a56d2b
* | | | Merge "Avoid rebuilding epoll set when PFD status report is done."Jeff Brown2015-03-131-3/+4
|\ \ \ \
| * | | | Avoid rebuilding epoll set when PFD status report is done.Jeff Brown2015-03-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we close the PFD status channel before returning, then the Looper will take care of unregistering it correctly but it will end up doing extra work to rebuild the epoll set to work around a limitation of the epoll interface. If we unregister the FD first then this extra work will not be required so it's slightly more efficient this way. Bug: 19715279 Change-Id: I0f7b90f3458adf1894b7561c05fa842fdb87b498
* | | | | Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O."""Jeff Brown2015-03-131-39/+31
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""Jeff Brown2015-03-121-39/+31
| | | | | | | | | | | | | | | | | | | | This reverts commit 0f0b7f2fb36450fb5f16e0d50a4ee519edc491af.
* | | | | am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."Nick Kralevich2015-03-131-28/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '870110e01af5c4875a9cf7134cee7c6842fd31af': Drop unusable SELinux APIs.
| * \ \ \ \ am 30fcd2aa: Merge "Drop unusable SELinux APIs."Nick Kralevich2015-03-131-28/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9': Drop unusable SELinux APIs.
| | * | | | | Drop unusable SELinux APIs.Stephen Smalley2015-03-131-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSELinuxEnforce is not allowed by policy. get/setBooleanValue and getBooleanNames are moot since SELinux policy booleans are forbidden by CTS. Change-Id: I512953edd1c38828efce698ae8475603775c32e8 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | Merge "Start moving text measurement into native code"Raph Levien2015-03-134-29/+99
|\ \ \ \ \ \ \
| * | | | | | | Start moving text measurement into native codeRaph Levien2015-03-134-29/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to move text measurement into native code, mostly so that alternate measurement for hyphens can be performant. This patch begins that migration, in the main StaticLayout case, but still surfaces the widths array to Java (for ellipsis calculation), and also includes a hack (used mostly for testing) for computing widths in Java and sending them down to native code when TextPaint is subclassed. Change-Id: I476c9e8b3aa8e4e3552eb18f66c4bcd5683f3a72
* | | | | | | | Merge "More work on collecting assist data."Dianne Hackborn2015-03-1321-101/+593
|\ \ \ \ \ \ \ \
| * | | | | | | | More work on collecting assist data.Dianne Hackborn2015-03-1221-101/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize parceling of AssistData (which is now renamed to AssistStructure) by pooling duplicated class name strings. Change text associated with a view node to a CharSequence, so styling information comes along. Include global text attributes -- size, colors, etc. Introduce a new AssistContent structure, which allows us to propagate information about the intent and data the activity is looking at. This further allows us to propagate permission grants, so the assistant can dig in to that data. The default implementation propagates the base intent of an activity, so if for example you bring up the assistant while doing a share the assistant itself has the same information and access that was given to the share activity (so it could for example share it in another way if it wanted to). Did some optimization of loading PersistableBundle from xml, to avoid duplicating hash maps and such. Changed how we dispatch ACTION_ASSIST to no longer include the more detailed AssistStructure (and new AssistContent) data when launching; now the example code that intercepts that needs to be sure to ask for assist data when it starts its session. This is more like it will finally be, and allows us to get to the UI more quickly. Change-Id: I88420a55761bf48d34ce3013e81bd96a0e087637
* | | | | | | | | Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN"Benjamin Franz2015-03-131-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_INBenjamin Franz2015-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19704419 Change-Id: I3fc970eae8ef947775b6b565916bb245dea1b43b
* | | | | | | | | | Merge "Do not hide any call log entries when they are added."Santos Cordon2015-03-131-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not hide any call log entries when they are added.Santos Cordon2015-03-121-8/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a call log entry is added, and it's phone account does not match a currently registered one, we set it to hidden. This code was built for the calllog restore case where call log entries would be hidden when added if the original phone account wasn't also present on the new device (where the restore is being performed). We no longer do that so we're removing the code that sets any call log entry to hidden. Change-Id: I26ee27369e94c73446f7553f84cd4d8d4f2ff658
* | | | | | | | | | Merge "Expose isSystemImeThatHasSubtypeOf to Settings"Yohei Yukawa2015-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Expose isSystemImeThatHasSubtypeOf to SettingsYohei Yukawa2015-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for a recent attempt to minimize the number of default enabled IMEs. - part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3 - part2: Ife93d909fb8a24471c425c903e2b7048826e17a3 - part3: I6571d464a46453934f0a8f5e79018a67a9a3c845 - part4: I871ccda787eb0f1099ba3574356c1da4b33681f3 In the avobe CLs, an internal (hidden) method InputMethodUtils.isValidSystemDefaultIme was marked as deprecated and we decided to migrate to InputMethodUtils.isSystemImeThatHasSubtypeOf. To finish this refactoring, this CL make the new method visible to the settings app. InputMethodUtils.isValidSystemDefaultIme remains to be an internal method. No behavior change is intended. Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8
* | | | | | | | | | | Support a Primary and a Floating ActionMode in DecorView.Clara Bayarri2015-03-131-63/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL modifies the support for a single ActionMode in PhoneWindow. DecorView to support both a Primary and a Floating ActionModes simultaneously. Things pending after this CL: - Handling an actual Floating ActionMode - Cleaning up the now unused ActionModeWrapper and its related code Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365
* | | | | | | | | | | Add a type parameter to startActionMode() calls.Clara Bayarri2015-03-1314-132/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires adding a new method to View and Window.Callback to pass down the type as a parameter. For compatibility purposes, the new method implementations keep the type and call the old method, in case clients have subclassed it. Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
* | | | | | | | | | | resolved conflicts for merge of b6b9fe21 to masterAndreas Gampe2015-03-137-1904/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | | Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
| * | | | | | | | | am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."Lorenzo Colitti2015-03-127-1908/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8': Remove dead code, mostly DataStateTracker.
| | * | | | | | | | Merge "Remove dead code, mostly DataStateTracker."Lorenzo Colitti2015-03-127-1908/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-117-1908/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
| * | | | | | | | | | am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"Andreas Gampe2015-03-112-0/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdd3fb5cdb9be8ae087c6d0fef2a545fca1c4205': Extracted a separate class to run dexopt on packages
| | * | | | | | | | | Extracted a separate class to run dexopt on packagesFyodor Kupolov2015-03-112-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performDexOptLibsLI and related methods were extracted to PackageDexOptimizer class. Minor refactoring of PackageManagerService. This is a non-functional change. It should simplify further work to allow storing OAT files inside package dir. (cherry picked from commit eeea67b8c3678d882d3774edc41242c63daa60fa) Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
* | | | | | | | | | | Merge "NetworkStatsService to adjust VPN stats before recording."Wenchao Tong2015-03-133-0/+91
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NetworkStatsService to adjust VPN stats before recording.Wenchao Tong2015-03-123-0/+91
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Creates a new Parcelable class VpnInfo to hold required parameters for VPN stats adjustments. * ConnectivityService to collect infomation and provide a list of VpnInfo, one for each user. * NetworkStatsService passes the VpnInfo array to NetworkStatsRecorder. * NetworkStatsRecorder calls NetworkStats.migrateTun() to do the math. * Poll NetworkStats when the vpn application calls setUnderlyingNetworks(). Bug: 19536273 Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
* | | | | | | | | | | Merge "Add API for WebView OffscreenPreRaster setting."Hui Shu2015-03-131-0/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add API for WebView OffscreenPreRaster setting.Hui Shu2015-03-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 19592029 Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3
* | | | | | | | | | | | resolved conflicts for merge of 42f55d1e to masterMarco Nelissen2015-03-121-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
| * | | | | | | | | | am a3d25d74: Merge "Fix context leak"Marco Nelissen2015-03-111-3/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d': Fix context leak
| | * | | | | | | | | Fix context leakMarco Nelissen2015-03-111-3/+8
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using an activity context with AudioManager could cause that context to be held on to longer than desired, for example if the caller acquired audio focus but never abandoned it. Fix acquire/abandon in VideoView, and use the application context in AudioManager to mitigate the issue for other misbehaving code. Bug: https://code.google.com/p/android/issues/detail?id=152173 Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
* | | | | | | | | | Merge "NetworkStats to support VPN accounting."Wenchao Tong2015-03-121-0/+160
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NetworkStats to support VPN accounting.Wenchao Tong2015-03-091-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new method to migrate underlying network traffic from VPN app to other apps. Bug: 19536273 Change-Id: I3434cad361592e26b01225edf8012f7b16afc98f
* | | | | | | | | | | Merge "Fix negative touch word offset that caused crashing when selecting text"Roozbeh Pournader2015-03-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix negative touch word offset that caused crashing when selecting textMady Mellor2015-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the offset between the touch event and the start / end of the word could result in a negative value - we don't care or want this value to be negative. The negative value also causes the returned offset to be outside the bounds of the text which resulted in a crash. Bug: 19705184 Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730
* | | | | | | | | | | | Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""Jeff Brown2015-03-121-31/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Update ParcelFileDescriptor to use non-blocking I/O."Jeff Brown2015-03-121-31/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19715279 This reverts commit a34a3bdcbf2e7057d294a8699bbe1be880500f6d. Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347
* | | | | | | | | | | | Merge "Camera: add @hide API for setting camera rotation"Yin-Chia Yeh2015-03-123-2/+150
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Camera: add @hide API for setting camera rotationYin-Chia Yeh2015-03-103-2/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only adding API header. Haven't filled in implementation. Change-Id: I99a1c84d194dd20562845a0f566dd10ddb3041b7
* | | | | | | | | | | | Merge "Allow polling for WindowInsets."Filip Gruszczynski2015-03-122-6/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow polling for WindowInsets.Filip Gruszczynski2015-03-112-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36feb2403b1bcf6de5d8808734c46999a38e7403
generated by cgit v1.1 at 2024-09-10 13:51:57 +0000