drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,586 Commits 1 Branch 0 Tags
Commit Graph

152586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
32c820fac0 update android workplace screenshot 
bug: 18038081

Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
 2014-10-22 17:58:50 -07:00
Ye Wen
9d28487e05 Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 2014-10-23 00:23:28 +00:00
smain@google.com
9f987e0ac7 fix a few of the tags for helpouts compatibility 
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
 2014-10-22 17:13:51 -07:00
smain@google.com
545049665c Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 2014-10-23 00:06:10 +00:00
smain@google.com
13eb86a113 Merge "add helpouts widget to first round of pages" into lmp-dev 2014-10-22 23:59:15 +00:00
Ye Wen
a81f23e5e5 Disable Content-Disposition header for 53005 and 310120 
Platform PDU lib uses a flag in frameworks/base/core resources
instead of mms config in mms service

b/17634414

Change-Id: I0ba78d6b7d6f2844eafa3dac3691828414975f43
 2014-10-22 16:28:39 -07:00
Rich Slogar
cb79d08666 docs:Update 4.4W for Wear GPS suppport 
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
 2014-10-22 15:23:15 -07:00
xin He
5085c4c293 Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 2014-10-22 17:19:26 +00:00
Ricardo Cervera
0ae6e37e64 Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 2014-10-22 17:03:44 +00:00
smain@google.com
61139c8d44 add helpouts widget to first round of pages 
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
 2014-10-22 09:53:40 -07:00
Quddus Chong
b8796e441c docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
 2014-10-22 09:45:44 -07:00
Deepanshu Gupta
568f16ccfb Merge "Check Bridge init before disposing." into lmp-dev 2014-10-22 00:57:34 +00:00
Jinsuk Kim
0c74939024 Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev 2014-10-21 23:25:58 +00:00
Santos Cordon
028217eb67 Merge "Add hidden method to access a connection's service." into lmp-dev 2014-10-21 23:22:02 +00:00
Paul Jensen
1de55d3cc8 Show ProgressDialog when waiting for radio to turn on when provisioning. 
Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up. This is only for provisioning APN support (only AT&T tablets now).

bug:15990642
Change-Id: Ibea894ee934bae2045c0462ae79bfa39d0ef3f05
 2014-10-21 16:06:35 -07:00
Jinsuk Kim
5c0f472d82 CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE 
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.

Bug: 17408780

Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
(cherry picked from commit b22d9ee0a364b10d488dd6a2e8ba69d5ca7f6258)
 2014-10-21 21:57:34 +00:00
Guang Zhu
ccbeb61ac2 Block monkey from creating user profiles 
Bug: 17721767
Change-Id: Ibf686d6aa5da29411ee23f8ce6826ed93c1fa970
 2014-10-21 14:36:13 -07:00
Ricardo Cervera
41848002af docs: Removing extra semicolons in Wear notif examples. 
Bug: 17053734

Change-Id: If11b711e2797eeb2fc392e0658d644c585e4bc54
 2014-10-21 13:15:39 -07:00
smain@google.com
a010375c54 some fixes to TV App quality and TV games doc. 
add section to TV Games doc about controller instructions w/ template download.
clarify use of <meta-data> tag and standardize headings per Training conventions.

Change-Id: I6f61a0d4fd976098a6db9ded33c61419a764ad4f
 2014-10-21 12:18:35 -07:00
Adrian Roos
7b4a38b197 Delay discovery of system trust agents 
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.

Bug: 18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
 2014-10-21 17:07:41 +02:00
Leon Scroggins III
3c8bde5534 Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 2014-10-21 13:52:30 +00:00
Robin Lee
e1c9489cc4 Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 2014-10-21 11:54:52 +00:00
Leon Scroggins III
91332e7eca Report that a JavaInputStreamAdaptor is at end. 
This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
 2014-10-20 22:49:35 +00:00
RoboErik
2fa604fc59 Merge "Add missing break to switch statement" into lmp-dev 2014-10-20 22:08:07 +00:00
RoboErik
59759903a9 Add missing break to switch statement 
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
 2014-10-20 14:56:32 -07:00
smain@google.com
21de5f3f12 Doc change: misc changes to highlights. 
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
 2014-10-20 14:34:22 -07:00
Adam Lesinski
3f8c7dec6b Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 2014-10-20 20:55:48 +00:00
Robin Lee
e69bdca44b DevicePolicy: Restore CA warning to K behaviour 
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.

Bug: 17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
 2014-10-20 20:55:40 +00:00
ztenghui
877ce2c42b Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev 2014-10-20 20:29:17 +00:00
Adam Lesinski
aff7c2447d AAPT: Fix path for final generated resources on Windows 
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
 2014-10-20 12:15:25 -07:00
RoboErik
578fbe898f Merge "Set the metadata rating correctly in RCC" into lmp-dev 2014-10-20 19:07:52 +00:00
Santos Cordon
af1b296a41 Add hidden method to access a connection's service. 
This change exposes a method that is used by the actual
fix here: I4e4789c044d9e3614f42143cfa6053881a6d109b

Bug: 17962996
Change-Id: Iec3795ea372634120c71b0a80ee046e372569ecf
 2014-10-20 18:38:55 +00:00
Deepanshu Gupta
b69ec7708b Check Bridge init before disposing. 
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.

Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
 2014-10-20 11:12:53 -07:00
Geoff Mendal
00831836cd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 16:56:51 +00:00
smain@google.com
065b94c6a6 update workplace description in lollipop highlights 
bug: 18038081

Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
 2014-10-20 09:48:33 -07:00
RoboErik
38696ba77d Set the metadata rating correctly in RCC 
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
 2014-10-20 09:48:13 -07:00
Geoff Mendal
c09f8b7a08 Import translations. DO NOT MERGE 
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
 2014-10-20 09:34:39 -07:00
Geoff Mendal
bae5d85a77 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 13:41:25 +00:00
Geoff Mendal
d113e1b189 Import translations. DO NOT MERGE 
Change-Id: I9d2178c81e9acc3ce353f317787cb12f6e158666
Auto-generated-cl: translation import
 2014-10-20 06:35:29 -07:00
Adrian Roos
9c5896b808 Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 2014-10-20 12:59:00 +00:00
Baligh Uddin
67b404d688 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:42 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
b5c8ec76d7 Import translations. DO NOT MERGE 
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
 2014-10-19 12:55:23 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07:00
smain@google.com
a2f07a88aa add info about device owner app to the workplace highlights 
Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4
 2014-10-18 18:20:20 -07:00