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

140253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuncheol Heo
3722c32860 Merge "Add a permission resource for the protected media id." 2014-06-19 23:04:31 +00:00
Robert Ly
81c71c592f am 1fd580b7: am 5d9681a3: docs: auto landing cleanup 
* commit '1fd580b7c30529e772e3a1ce4ba6c55df689045d':
  docs: auto landing cleanup
 2014-06-22 18:42:15 +00:00
Wink Saville
67e0789cd3 Mobile_radio in battery history is not accurate 
Invoke TelephonyManager#listen to connect mPhoneStateListener to receive
the notifications.

Bug: 15568103
Change-Id: I5a3fa6347704e96ceb34289f74ba6e3157bbb333
 2014-06-22 14:41:22 +00:00
Robert Ly
d09692de9c am d62cb584: am e7e8c1b4: Merge "docs: Further work on the Android Auto dev site Added partner logos (car OEMs, aftermarket, apps) Added platform screenshots to the hero page" into klp-modular-dev 
* commit 'd62cb5843ae01ee01b51fbcd56c029116aad34cf':
  docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page
 2014-06-22 09:52:25 +00:00
Robert Ly
e7272399cc am ee80a268: am d7208fda: Merge "docs: remove description text for index" into klp-modular-dev 
* commit 'ee80a268ac8ce77c36448ed89720f0d78ff36f99':
  docs: remove description text for index
 2014-06-22 09:52:20 +00:00
Quddus Chong
2c902cb14c am aef3e9e6: am 1aa273e0: Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev 
* commit 'aef3e9e6fd313dd30acdbd6c40b8b5e12b181f49':
  docs: Updated Support page for L Developer Preview.
 2014-06-22 09:52:11 +00:00
Robert Ly
4de4f448bd am 901866cc: am efa289e2: docs: add device icons for index page 
* commit '901866ccd0e9f2c202e3200acf1a212cf7f1c260':
  docs: add device icons for index page
 2014-06-22 09:52:03 +00:00
Yuncheol Heo
93415a2713 Add a permission resource for the protected media id. 
Matched Chromium change: http://crrev.com/309553004
> aw: Add ProtectedIdPermissionRequest.
>
> The DRM ID can be exploited to identify users. so the information
> should be handled under user's explict permission.
> This CL hooks up Chromium's permission request with Android Webview's
> permission mechanism.
>
> BUG=346841
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276149

Bug: 11762354

Change-Id: Ife3c123ecca2c577ed1bc02a110b87618c6569cf
 2014-06-20 19:00:28 +09:00
Jinsuk Kim
d1fdf0238a Merge "Report device status event in HdmiControlService" 2014-06-19 22:55:19 +00:00
Robert Ly
3323e55439 Merge "add new image and landing page for l-preview" into klp-modular-dev 2014-06-19 22:33:55 +00:00
Robert Ly
7c5f1f1aae add new image and landing page for l-preview 
Change-Id: Ide3917a9795269b6606e3a7349c49b1d5b9b04b2
 2014-06-19 16:53:57 -07:00
Jinsuk Kim
4893c7efde Report device status event in HdmiControlService 
This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.

Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
 2014-06-20 07:26:17 +09:00
Yorke Lee
5e0f061c0f Revert "Add getSystemPhoneApplication to TelecommManager" 
This reverts commit 8200c05dcf206f2621fc8017235c739b66d57e8b.

Change-Id: I6536627491830804ddedac0287fa0bcdf014280c
 2014-06-19 22:25:13 +00:00
Jeff Sharkey
0270cfb71d Merge "Explicitly collect manifest digests." 2014-06-19 22:08:21 +00:00
Jeff Sharkey
032f2b246b Explicitly collect manifest digests. 
Previously it was a side effect of collectCertificates().

Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
 2014-06-19 15:49:05 -07:00
Adrian Roos
cdf74c2881 Merge "Implement keyguard user switcher" 2014-06-19 20:37:59 +00:00
Adrian Roos
8ddb2da875 Implement keyguard user switcher 
Bug: 15545213
Change-Id: I2d18cc3c83d76991fe11fc4bff7e8eecc25df4b5
 2014-06-19 15:47:46 -07:00
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence 
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
 2014-06-19 15:46:02 -07:00
Paul Soulos
5781fec20a Merge "Adds usage stat columns to Entity" 2014-06-19 22:33:55 +00:00
Paul Soulos
42cdda831d Adds usage stat columns to Entity 
Change-Id: I273675ee85aba49440a494e4ae27e9104ffb2fe0
 2014-06-19 16:13:38 -07:00
Craig Mautner
bb27b1c3a6 Merge "Allow a root activity to relinquish task identity" 2014-06-19 20:37:59 +00:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity 
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
 2014-06-19 16:40:01 -07:00
smain@google.com
aa10b05a3b am b6974e92: add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview. 
* commit 'b6974e9261f9d0bb4af39950496428cd2b45eb6d':
  add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
 2014-06-19 19:45:47 +00:00
smain@google.com
b6974e9261 add info about enabling USB debugging to adb doc. 
part of initiative to document the flash process for L preview.

Change-Id: I5177ba63d1cb2f291002b0fdb0b0209ca9e17072
 2014-06-19 11:58:35 -07:00
Calin Juravle
e279cd6d21 Fix the initialization of some profile properties 
Change-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f
 2014-06-19 18:51:47 +01:00
Alexandra Gherghina
6e2ae2590d Adds cross-profile intent filters for the Settings app 
Bug: 15466742
Change-Id: Id9af588f2f3d51a562ef2a06fe7404c96123cc2e
 2014-06-19 18:04:45 +01:00
Jeff Sharkey
65dfc83cef am b9a45aae: am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit 'b9a45aae8d07e7a92806b53cbc36f5488e3bac2d':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:17:03 +00:00
Jeff Sharkey
b9a45aae8d am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit '447b68e767943fdde297d78321378e2623985a0a':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:11:51 +00:00
Jeff Sharkey
447b68e767 am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit 'b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:07:52 +00:00
Jay Civelli
800631affd Reenabling permission check for TrustAgent. 
Now that master is using Manchego, the permission check for TrustAgent can
be reenabled.

Change-Id: I3c05a97de965684bef460ab3e3289657f9542af3
 2014-06-19 08:32:18 -07:00
Sungsoo Lim
ab981c5653 Make getAvailability() always return true 
Bug: 15745402
Change-Id: If40ecef74e5bd7124e0020fcdbcd4637b2d82d97
 2014-06-19 23:58:27 +09:00
Jungshik Jang
16321b8007 Use SystemAudioStatusAction in SystemAudioAction. 
SystemAudioAction includes SystemAudioStatusAction which
is required for SystemAudioAutoInitiationAction.

Change-Id: I9f2ae1ddea305e1c1e18410060842288c271cd4b
 2014-06-19 20:00:52 +09:00
Narayan Kamath
ca2197b045 Update javadoc for android.os.Bundle. 
Call out the fact that defaultValue is returned if a null
mapping exists for a given key.

bug: https://code.google.com/p/android/issues/detail?id=68453
Change-Id: Ifa6e94c1dee47809f70cadcb668cb98cb8dbef14
 2014-06-19 10:46:00 +01:00
Robert Ly
611e591a3a am 4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev 
* commit '4d521ed9663a7a4f938b3c09f06af557614ca3d3':
  new lmp prev landing page
 2014-06-19 08:53:46 +00:00
Ricardo Cervera
c93766932e am 10276c32: Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev 
* commit '10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e':
  docs: Updated the screenshot for the Android Studio page.
 2014-06-19 08:53:29 +00:00
Stephen Hines
7f22d01545 am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:26:15 +00:00
Stephen Hines
c5b11fcc1f am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'ff83ed2dc34f0595bcff2cb7b5d71bb39191963e':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:18:17 +00:00
Quddus Chong
6f2b8e55ee am 99a25dd3: am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev 
* commit '99a25dd3912a67498966728dcf7834450fbba3f6':
  docs: Updates to L Preview Highlights.
 2014-06-19 03:16:28 +00:00
Stephen Hines
ff83ed2dc3 am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'b02dadd47c20b65569413cb4575c6050fe7b609f':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:13:37 +00:00
Quddus Chong
99a25dd391 am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev 
* commit '84611a1fe13299e3279d9bc5b0a2ec33d54c7e92':
  docs: Updates to L Preview Highlights.
 2014-06-19 03:12:34 +00:00
Brian Carlstrom
7f047f02ad am 80f1fe5f: am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart" 
* commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8':
  Switch from core to core-libart
 2014-06-19 02:16:34 +00:00
Brian Carlstrom
80f1fe5f7c am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart" 
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
  Switch from core to core-libart
 2014-06-19 02:08:10 +00:00
Brian Carlstrom
f8077cf2d7 am 8e21e215: Merge "Switch from core to core-libart" 
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart
 2014-06-19 02:03:35 +00:00
Robert Ly
4d521ed966 Merge "new lmp prev landing page" into klp-modular-dev 2014-06-19 00:17:11 +00:00
Robert Ly
26115661a3 new lmp prev landing page 
Change-Id: I28cf943e21fc9b1e3c044830ac21079d5464dee8
 2014-06-18 23:50:29 -07:00
Quddus Chong
84611a1fe1 Merge "docs: Updates to L Preview Highlights." into klp-modular-dev 2014-06-19 00:17:11 +00:00
Quddus Chong
17305644a8 docs: Updates to L Preview Highlights. 
Change-Id: Ie64c90eebab7fc740c30f6881e6408d634e0c919
 2014-06-18 20:02:24 -07:00
Jason Sams
3aa4de11b0 am 802aaf3b: am 47de3060: Merge "Fix element size on 64b" 
* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b
 2014-06-18 23:08:35 +00:00
Jeff Brown
e07b94bf6c Perform haptic feedback for wake gesture. 
Change-Id: I0275853ad0de7188cb16b68899085170376b527a
 2014-06-18 15:56:27 -07:00