Fabrice Di Meglio
5eba4c5697
Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev
2014-06-10 01:00:45 +00:00
Aaron Whyte
83955cb260
Catch OperationUnsupportedException when linkifying using WebView
...
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296
Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
2014-06-09 17:59:03 -07:00
Fabrice Di Meglio
1e70acb9fc
Fix bug #14258811 Permissions icons are not visible in App info
...
- add updated assets for Material Theme
Change-Id: Iaa1e5787e5245fa5cffe5a07eb612b62ce9573f7
2014-06-09 17:58:02 -07:00
Mike J. Chen
a565754a81
Merge "Update default android boot animation png files"
2014-06-10 00:55:07 +00:00
Igor Murashkin
e1442204c1
camera2: Fix session-related CTS test failures
...
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
2014-06-09 17:51:24 -07:00
Justin Koh
b7c39cee9e
Remove WebIconDatabase calls from android.provider.Browser
...
This class has been deprecated, so no need to call it.
Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
2014-06-09 17:50:34 -07:00
Christopher Tate
115afdadb5
Switch framework to using new scheduled-work API
...
Also add the intended permission-use enforcement to said API.
Bug 14994893
Bug 14993295
Change-Id: I5a3ffd32d0702c68f4ef6da68f7fa6e9de674380
2014-06-09 17:49:50 -07:00
Matthew Williams
5553aeb2ae
Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
2014-06-10 00:24:05 +00:00
Matthew Williams
effacfa75b
Add OnNetworkActive to TaskManager and simplify locking.
...
Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.
Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.
Fixed some bugs that stopped timecontroller from executing tasks.
Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.
Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.
Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
2014-06-09 17:18:11 -07:00
Jinsuk Kim
e44e754166
Merge "Tag HdmiControlService API classes with @hide/@SystemApi" into lmp-preview-dev
2014-06-10 00:11:20 +00:00
Adam Lesinski
961dda7796
Creating an empty package should be succesfull
...
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
2014-06-09 17:10:29 -07:00
Jeff Sharkey
f8f69b899f
Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev
2014-06-10 00:10:28 +00:00
Xiaolei Wang
2641ab276c
Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev
2014-06-10 00:09:38 +00:00
Jeff Sharkey
b9fbb7290b
Refactor directory API to "opening document tree."
...
Cleans up API so it consistently refers to opening or working with a
subtree of documents. Also separates isChildDocument() support from
the concept of directory tree selection.
Bug: 15429194
Change-Id: Ice66a751ff4bd0cc4d34c44c5da13a0dc4186dc9
2014-06-09 17:07:58 -07:00
Jeff Brown
e2708d98ce
Delete stale commented out declarations.
...
Most of these methods have now been implememented earlier
in the class.
Change-Id: Id9ef2fa09c64ada788f1b9d95b14836f98498843
2014-06-09 17:04:06 -07:00
Aravind Akella
27900358f2
Add java APIs for Sensor reportingMode.
...
Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
2014-06-09 16:56:29 -07:00
Jinsuk Kim
66d1eb285b
Tag HdmiControlService API classes with @hide/@SystemApi
...
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
2014-06-09 23:49:21 +00:00
Alan Viverette
5efab6c98c
Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev
2014-06-09 23:32:35 +00:00
Alan Viverette
fc9f55ae12
Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev
2014-06-09 22:58:13 +00:00
Mike J. Chen
784184e75d
Update default android boot animation png files
...
Bug 15143975
Change-Id: I11c9f43aaec4ebff9d291084fc8f997f15c46ddd
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-06-09 15:54:00 -07:00
Michael Kolb
7119c07192
resolved conflicts for merge of 1e6706ab to master
...
Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e
2014-06-09 15:35:59 -07:00
vandwalle
6123315ad4
Merge "remember and report network score"
2014-06-09 22:30:26 +00:00
Chris Craik
cb9851d4fe
Merge "Annotated the drawing commands."
2014-06-09 22:22:11 +00:00
Xiaolei Wang
b2b2ac1287
Add constants to Android TV On Device Search.
...
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-09 15:07:17 -07:00
Doug Zongker
c302e4d32f
hide RECOVERY permission from L preview -- DO NOT MERGE
...
Bug: 15516323
Change-Id: I16a6355f631523919607bd111e5ebfe16fa4506e
2014-06-09 15:04:38 -07:00
vandwalle
2ab9089dfa
remember and report network score
...
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
2014-06-09 14:50:47 -07:00
Jeff Brown
238fd930fc
Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
...
This is a first pass at annotating permissions that should not be
granted or used by to third-party apps but that may be required by
privileged system applications. For this patch, the annotation was
only added to permissions that have a protection level of at least
system. Signature-only permissions were left alone since they only
need to be visible to built-in components.
Change-Id: I189472028274c133793ad8e4068585c536dd7f38
2014-06-09 14:31:41 -07:00
Jeff Brown
709ce0a4c6
Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
...
When aapt sees @SystemApi in the XML comment associated with a resource,
it will now remove this tag from the comment (since is it not meaningful as
a Javadoc tag) and instead add an @android.annotation.SystemApi annotation
to the declared type or member. This enables easy downstream processing of
this annotation from generated code.
Change-Id: If984908477648c0c90be52fdc955fbb891d99b28
2014-06-09 14:28:42 -07:00
Jeff Brown
5c507c1371
Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
...
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
2014-06-09 14:28:11 -07:00
Amit Mahajan
437a77d4bb
am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
...
* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
Handle provisioning APN by turning off/on radio.
2014-06-09 21:12:43 +00:00
Justin Koh
ce8c1086fb
am eba8782a: Add NPE check to getSystemWindowInsets
...
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
Add NPE check to getSystemWindowInsets
2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403
am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
...
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
Fix Browser when running on a platform without webview
2014-06-09 21:12:35 +00:00
Robert Ly
a60406f546
am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs
...
* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
remove erroneous file
2014-06-09 21:12:31 +00:00
Adam Lesinski
5fed49f7d6
am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
...
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
Allow for a NoOp implementation of DrmManagerClientImpl
2014-06-09 21:12:25 +00:00
Michael Kolb
1e6706abb2
am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev
...
* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
Remove circular mask
2014-06-09 21:12:19 +00:00
Jeff Brown
a2f61a39ea
Merge "Add @SystemApi annotation to internal permissions."
2014-06-09 21:05:43 +00:00
Jeff Brown
96c2e9f1cb
Merge "Add support for @SystemApi annotation to aapt."
2014-06-09 21:05:17 +00:00
Michael Wright
6fffd2b854
Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev
2014-06-09 20:53:55 +00:00
Julia Reynolds
bbf4270a6c
Material-ize the restrictions pin challenge.
...
Change-Id: I90be6d2e1b1043f45a8067561a0d5ce56cc02dd6
2014-06-09 16:39:21 -04:00
Antonio Calabrese
ff7215aa0c
Annotated the drawing commands.
...
Change-Id: I4eeb35ecaf4aa16e0924b5215351fce79c68369b
2014-06-09 13:37:00 -07:00
Michael Wright
cb183fcd6e
Pack PointerCoords with BitSet. DO NOT MERGE
...
The converstion from Java PointerCoords to native and then back again
was inconsistent. Using a BitSet for all of these operations keeps it
in sync.
Bug: 15000382
Change-Id: Id3a4558dae3ba3df7c4a9b3cb9d5580b957db8d5
2014-06-09 13:24:53 -07:00
Matthew Williams
508a8a0ab4
Merge "Add test app for JobScheduler" into lmp-preview-dev
2014-06-09 20:23:10 +00:00
Amit Mahajan
3f175a3587
am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
...
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
Handle provisioning APN by turning off/on radio.
2014-06-09 19:50:09 +00:00
Amit Mahajan
e5a28d34f6
am 20c5ce50: Handle provisioning APN by turning off/on radio.
...
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
Handle provisioning APN by turning off/on radio.
2014-06-09 19:46:01 +00:00
RoboErik
e252909394
am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
...
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
Adds listeners for changes to the list of active sessions
2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153
am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev
...
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
b/15388389 Add volume handling support to MediaRouter
2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5
am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
...
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
Add a way to get the package/pid of the session
2014-06-09 19:29:48 +00:00
RoboErik
5f670bd65c
am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev
...
* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
b/15452153 Send 0 delta volume requests
2014-06-09 19:29:42 +00:00
Jae Seo
8799179638
am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev
...
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
Fix a typo in TvContract
2014-06-09 19:29:28 +00:00
Jerome Poichet
7fc1e22150
am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev
...
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
Using Manufacturer and not brand for device name
2014-06-09 19:29:23 +00:00