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

120292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
e4095a80b6 Support CAST V2 Authentication in MediaDrm 
Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
 2014-04-01 14:25:35 -07:00
Craig Mautner
2fc798a227 resolved conflicts for merge of 8c6e6e73 to klp-dev 
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
 2014-04-01 13:57:37 -07:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
Craig Mautner
8c6e6e7372 am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959 am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:43:41 +00:00
Craig Mautner
d1c82f8fc2 am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381 am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:30:41 +00:00
Craig Mautner
fc80fbe3d5 am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233 am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c Fix FLAG_DISMISS_KEYGUARD not working 
Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
 2014-04-01 12:10:54 -07:00
quddusc
f425e5ea05 am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:30:33 +00:00
quddusc
c7f403f46d am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit '5321e9bd48db680c618a490fb38c060c3c05beba':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:24:38 +00:00
quddusc
5321e9bd48 Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 2014-04-01 18:12:06 +00:00
Scott Main
c37960733a am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c8b6feb2007259cdc4053a9774e31847ee60d592':
  laptop image with redacted
 2014-04-01 17:59:12 +00:00
Scott Main
3bd0a44bbf am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3':
  dashbaord update for 4/1/14
 2014-04-01 17:59:08 +00:00
quddusc
f74a6cf388 docs: Fixed outdated link to Google Analytics docs. 
Bug: 13742301

Change-Id: Idb439a38299be808cd1cd1d317d67efe78f785cc
 2014-04-01 17:53:55 +00:00
Scott Main
c8b6feb200 am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit '356820063afa85c78dd7f7b9bce2b62169e490bc':
  laptop image with redacted
 2014-04-01 17:52:36 +00:00
Scott Main
a7afd38f30 am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit '1afdbb93446cdc9238bf327155646950ae80dbe4':
  dashbaord update for 4/1/14
 2014-04-01 17:52:33 +00:00
Ricardo Cervera
bb755da9f7 am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:49:40 +00:00
Scott Main
356820063a Merge "laptop image with redacted" into klp-docs 2014-04-01 17:47:03 +00:00
Scott Main
1afdbb9344 Merge "dashbaord update for 4/1/14" into klp-docs 2014-04-01 17:46:37 +00:00
Ricardo Cervera
8e5775daae docs: Added notes to use the last SDK version to the Build your First App class. 
Change-Id: I35820ff887b3d0f4ccc0ce7720576e3e692109b5
 2014-04-01 10:46:16 -07:00
Ricardo Cervera
c192cdd3c4 am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'cf96f815854b87f8a2304fbaf5030d574671e6e0':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:43:32 +00:00
Scott Main
b0b84487c1 dashbaord update for 4/1/14 
Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
 2014-04-01 10:39:42 -07:00
Ricardo Cervera
cf96f81585 docs: Renamed the document on building with Android Studio 
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
 2014-04-01 10:16:45 -07:00
Scott Main
bb55852daf laptop image with redacted 
Change-Id: I89e6b37840757a53c38686a2cf69297e558ef6d0
 2014-03-31 20:40:34 -07:00
Baligh Uddin
8c3d3e8269 am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit '53b3d44f524c162a18ca91034c90ac9f7e62e561':
  Import translations. DO NOT MERGE
 2014-04-01 00:15:57 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
 2014-04-01 00:15:52 +00:00
Baligh Uddin
53b3d44f52 am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit 'dc5e02bdccbbc60ede21ae706f06c696b6983812':
  Import translations. DO NOT MERGE
 2014-04-01 00:09:22 +00:00
Scott Main
adcb288e38 am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:03:18 +00:00
Michael Kolb
5de886a158 Add outset to decor view measuring 
Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
 2014-03-31 16:49:55 -07:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix. 
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
 2014-03-31 16:18:15 -07:00
Deepanshu Gupta
e345507ca4 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)
 2014-03-31 23:15:52 +00:00
Baligh Uddin
ee800b04d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-31 22:11:33 +00:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Craig Stout
ecaea7e60c Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 2014-03-31 19:02:25 +00:00
Baligh Uddin
23f64109d0 Import translations. DO NOT MERGE 
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
 2014-03-31 11:37:11 -07:00
Baligh Uddin
dc5e02bdcc Import translations. DO NOT MERGE 
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
 2014-03-31 11:34:59 -07:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:56:00 +00:00
Adam Hampson
594c73fc57 Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 2014-03-28 22:22:52 +00:00
Aaron Whyte
f10d0399bf Made secure-adb's new-public-key activity configurable. 
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.

Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
 2014-03-28 22:21:55 +00:00
Robert Greenwalt
e1549ae364 DO NOT MERGE Sanitize WifiConfigs 
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
 2014-03-28 14:54:53 -07:00
Ricardo Cervera
fe8b0eac93 docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147 
Change-Id: I0eaf8e757757da66ba1a6ce2b77cd709645219a1
 2014-03-28 13:56:04 -07:00