Evan Charlton
b8d0717934
Fix a small typo in javadocs
...
Service#START_FLAG_RETRY has an extra word; remove it.
Change-Id: I4743e2ea474c70fe5d31f1a4ef257f9752f8e823
2014-07-31 16:14:22 +00:00
Alexandra Gherghina
a709314537
Use the appropriate default icon
...
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.
Bug: 16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
2014-07-31 15:43:11 +00:00
Narayan Kamath
31e6b1445f
Switch TextUtils over to new ICU API.
...
.. and use Locale.getScript() instead of ICU.getScript.
bug: 15876704
(cherry picked from commit 08b3516984 )
Change-Id: Ifac179e0577d66062f32c95372b631bf574dfdf9
2014-07-31 12:55:49 +01:00
Sander Alewijnse
a87863a8bd
Fix deadlock window manager and device policy manager.
...
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.
Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
2014-07-31 09:16:46 +00:00
Dan Sandler
dc418e3365
Fix docs build.
...
Change-Id: I3be4c5b74e85d2491316986d8c3c0575cd01a8fc
2014-07-31 02:27:52 -04:00
Lorenzo Colitti
5b37fa2ed5
Allow using third-party HTTP/... stacks for per-network URLs.
...
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.
Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
2014-07-31 02:17:28 +00:00
Andres Morales
11d2e53dc0
NFC Unlock api changes
...
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
2014-07-31 01:09:02 +00:00
destradaa
f9a274c9b8
Add support for sources in Geofencing APIs.
...
Support setting the source when adding geofences.
b/14117199
Surface the source when FLP geofence changes state.
b/14119200
Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
2014-07-30 23:35:08 +00:00
Ruben Brunk
6a7d8c4289
camera2: Implement request templates for LEGACY.
...
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
2014-07-30 23:15:16 +00:00
Ruben Brunk
3fe9eba904
camera2: Add scene and effect mode for LEGACY.
...
Bug: 15116722
Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
2014-07-30 22:09:41 +00:00
Andres Morales
e9a8927662
Merge "Revert "NFC Unlock api changes"" into lmp-dev
2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d
Revert "NFC Unlock api changes"
...
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.
Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
2014-07-30 21:30:50 +00:00
Andres Morales
131197aa6e
NFC Unlock api changes
...
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
2014-07-30 21:17:06 +00:00
Alan Viverette
46359204a8
Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171
Update switch assets, fix SearchView asset 9-patch areas
...
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
2014-07-30 13:37:35 -07:00
keunyoung
fa75e3d465
Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev
2014-07-29 21:36:00 +00:00
keunyoung
1d0a7ccd00
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
...
- When this flag is set, system no longer keeps the display on while in car mode.
bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
2014-07-30 14:12:34 -07:00
Martijn Coenen
29c2e3797a
Make some NFC APIs @systemAPI.
...
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
2014-07-30 21:03:07 +00:00
Christoph Studer
f660edb25a
Merge "SysUI: Display group children when no summary is present" into lmp-dev
2014-07-25 23:01:28 +00:00
Christoph Studer
c8db24bc32
SysUI: Display group children when no summary is present
...
Also move common notification filtering into NotificationData
such that clients won't have to do it themselves anymore.
Probably also fixes a couple of multi-user issues.
Bug: 16302692
Bug: 16224431
Change-Id: Ic3c11cd1a224044486f5544e068ca5297d30c521
2014-07-30 21:43:17 +02:00
Julia Reynolds
12451a39f4
Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev
2014-07-25 23:01:28 +00:00
Julia Reynolds
c617f81545
API council - DISALLOW_APPS_CONTROL -- need better documentation.
...
Bug: 16401636
Change-Id: I168033eaabdb953d8e73f63792a7e729eb9eeff6
2014-07-29 14:01:30 +00:00
Adrian Roos
1cc41c938c
Merge "Make TrustAgentService a SystemApi" into lmp-dev
2014-07-24 15:36:04 +00:00
Adrian Roos
a06d5ca1d9
Make TrustAgentService a SystemApi
...
Bug: 16401527
Change-Id: I6d19281600bacac7c8a29afc07c39ca1d461d23c
2014-07-29 12:54:49 +02:00
Jim Miller
604e7558ef
Add new DevicePolicyManager API to allow fine-grained TrustAgent management
...
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.
Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
2014-07-28 21:32:01 -07:00
John Spurlock
2b0e09c59f
Settings: Constants for notification settings.
...
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
2014-07-28 20:43:47 -04:00
Sreeram Ramachandran
f4e0c0cb8e
Allow VPNs to add/remove link addresses dynamically.
...
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
2014-07-29 00:32:59 +00:00
Riley Andrews
4789e41a9f
Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev
2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2
Add cursor flags into SpriteController to suppor async cursor updates.
...
- This is fairly blindly taken from nvidia's implementation.
Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
2014-07-28 22:04:06 +00:00
Christopher Tate
c17739d112
Provide outside-facing API for data management intent+label
...
Bug 16346320
Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701
Merge "Add MHL getPortInfo" into lmp-dev
2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b
Add MHL getPortInfo
...
Allows MHL support flag to be put into port information
Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
2014-07-28 06:57:04 +09:00
Michael Wright
5438e4e173
Add missing documentation for createVirtualDisplay
...
Fix incorrect access modifier in Activity documentation.
Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362
camera2: Update preview counter after request completed.
...
Bug: 15116722
- This was causing the preview counter to double decrement
for requests where the jpeg callback was executed first.
Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Christopher Tate
9679410db5
Add data-management intent + label to BackupTransport API
...
Bug 16346320
Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
2014-07-28 21:33:15 +00:00
Craig Mautner
22132d7950
Make affiliatedTaskId public and unhidden.
...
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().
Fixes bug 16546323.
Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
2014-07-28 21:10:16 +00:00
George Mount
a7dc1702af
Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev
2014-07-28 18:28:56 +00:00
Selim Gurun
d92e726cbe
Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev
2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b
Revert "Load the WebView Java code from an APK." DO NOT MERGE
...
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.
Bug: 16448724
2014-07-28 21:07:24 +01:00
George Mount
2cacfe3a98
Allow changing bounds to and from a zero-sized bounds.
...
Bug 14590183
Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
2014-07-28 14:54:23 +00:00
Eino-Ville Talvala
bd9b106806
Camera2: CameraManager refurbishing and error management
...
- Invoke availability listeners when first added
- Handle camera service crashes
- Listen to service death
- Attempt to rebind on every call if service died
- If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked
Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237
Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
2014-07-28 20:21:12 +00:00
Bo Liu
c15fbba494
Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev
2014-07-28 18:28:56 +00:00
Robert Greenwalt
39ca3f5f69
Merge "Remove dead code 1." into lmp-dev
2014-07-24 20:48:02 +00:00
Sreeram Ramachandran
42065ac64c
Prohibit address families by default unless a VPN explicitly allows them.
...
Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
2014-07-28 18:52:41 +00:00
Robert Greenwalt
39fa65a3be
Remove dead code 1.
...
Starting with startUsingNetworkFeature and stop.
Figure it's easier to code review incremental changes.
Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
2014-07-28 11:34:36 -07:00
Sandeep Siddhartha
39c12fab49
Use blob (shared memory) for large data in sound model/recognition event/config
...
Also add a missing null check in writeBlob
Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
2014-07-28 11:10:32 -07:00
Alexandra Gherghina
a71e3903e5
Return a default icon from the package manager directly
...
Bug: 16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
2014-07-28 17:30:56 +00:00
John Reck
1c7a170fa3
Merge "Avoid calling non-final methods in ctor" into lmp-dev
2014-07-25 21:16:23 +00:00
John Reck
aae9f3bf17
Avoid calling non-final methods in ctor
...
Bug: 16239227
Avoid potential issues in views that override invalidate() but
are not prepared to have overridden methods called prior to their
ctor
Change-Id: Ic2574bdfea454451d6881c7e27a6474dc4dbc07c
2014-07-28 09:30:36 -07:00
John Reck
4830cede0c
Merge "Throw IAE on invalid scale" into lmp-dev
2014-07-25 21:16:23 +00:00