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

143138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
8a1b4436ff am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev 
* commit '375d5b90cf59ae201d5aeddca7fe06761f67e642':
  Support cluster-style installs for bundled apps.
 2014-07-17 18:15:33 +00:00
Youngsang Cho
cdc4e42265 Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 2014-07-17 18:11:21 +00:00
Youngsang Cho
6440db358c TIF: Hide TvContract.Channels.COLUMN_BROWSABLE 
TODO: Remove BROWSABLE in TvContract, TvProvider and TV app.

Bug: 16195951
Change-Id: I20e8e1e2f93e0133eba3694e0c1724d443250e59
 2014-07-17 20:27:46 -07:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager 
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
 2014-07-17 16:29:36 -07:00
Tyler Gunn
76291774d0 Merge "Wiring video state through from Connection" into lmp-dev 2014-07-17 18:11:21 +00:00
Tyler Gunn
aa07df84f2 Wiring video state through from Connection 
Bug: 16285417
Bug: 16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
 2014-07-18 01:30:34 +00:00
Chris Craik
f3e85b5bac Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev 2014-07-17 18:11:21 +00:00
henry.uh_chen
33f5a59ac3 [HWUI]: fix residual line on FrameBuffer 
Symptom: If app applies animation to enlarge a bitmap, there will be an residual
         line on the screen

Root Cause: On platform which has Tile Rendering implementation (ex. Qualcomm
            CPU), startTiling() call will restrict the framebuffer region which
            GPU can affect. So the expansion of clear region by 1 will not take
            effect if startTiling region is not expanded.

Solution: Expand the startTiling region by 1, too.

Reproduce steps: Apply animation to enlarge (and then shrink) a bitmap icon.

Cherry-pick of 20adb6ce4d52b15472e7e5ee953e06cc349a827c from AOSP

Change-Id: I163b898b87b74d221dc4210b7fa657aa93c82c19
 2014-07-17 21:50:01 +00:00
Ben Murdoch
86f8a7425b Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 2014-07-17 18:11:21 +00:00
Ben Murdoch
dc00a84af1 Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast. 
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
 2014-07-17 21:18:40 +00:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
dcb743e276 Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6 Camera2: replace partial quirks with normal partial result 
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
 2014-07-17 20:08:32 +00:00
Prashant Malani
9353e1a2b2 Merge "Make the booting flag update unconditional" into klp-modular-dev 2014-07-17 18:11:21 +00:00
Robert Ly
f1b18ded01 Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 2014-07-17 18:11:21 +00:00
Filip Gruszczynski
a76164e1d0 Merge "Only use bottom outset for main display." into klp-modular-dev 2014-07-17 18:11:21 +00:00
Filip Gruszczynski
b57503c34d Only use bottom outset for main display. 
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
 2014-07-17 11:23:13 -07:00
Ruben Brunk
84cca777e2 Merge "camera2: Fix swapped Face detection commands." into lmp-dev 2014-07-17 18:11:21 +00:00
Sandeep Siddhartha
fd195bb32f am 4b360037: Support model deletion 
* commit '4b3600378bf33874eab953c08e353caabff7aee9':
  Support model deletion
 2014-07-17 18:10:15 +00:00
Craig Mautner
2f2492088e am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 
* commit 'c2d339a630acfa2a19aa82f650a7c56f0da8e184':
  Additional cleanup after stack deletion.
 2014-07-17 18:10:03 +00:00
Adrian Roos
88f4de130a am 26f08cdc: Merge "QS Guest fixes" into lmp-dev 
* commit '26f08cdc82a6534b3acb4eef81c205ab6764bd96':
  QS Guest fixes
 2014-07-17 18:09:59 +00:00
Christopher Tate
aeeb24dbd7 am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit 'e78826f6bcb3c832fe2e732e60b18ce62202f840':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 18:09:55 +00:00
ztenghui
0d5016725f am e1bc5ddb: Add the RTL support to VectorDrawable. 
* commit 'e1bc5ddb5e67e61ee8fe144e5983f98d56c135a0':
  Add the RTL support to VectorDrawable.
 2014-07-17 18:09:52 +00:00
John Reck
c5f3bc1484 am 47751fe1: Revert "Separate Canvas JNI code from the implementation." 
* commit '47751fe100923c459b17eb017be3b7fc6c7efc5e':
  Revert "Separate Canvas JNI code from the implementation."
 2014-07-17 18:09:48 +00:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack. 
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
 2014-07-17 11:09:46 -07:00
Winson Chung
7cdd4b115e am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020) 
* commit '1e214f1daa0ee51097a7b7cc4fd4680d9059016a':
  Fixing regression in flinging not updating the stack. (Bug 16371020)
 2014-07-17 18:09:45 +00:00
Adam Connors
70cec90903 am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit 'd50ec637fab02ee54295dc6dbeac00214097b36d':
  Create DPM APIs for cross profile callerId
 2014-07-17 18:09:42 +00:00
Niels Egberts
fc4322f965 am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit 'a66d298ea27d7cb7d5927869eda196e2fa56da78':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 18:09:38 +00:00
Nancy Chen
f7179cb3ba am 4a9b99f5: API changes to enable account selection for a call 
* commit '4a9b99f5d8a4a9a3ce6f4a45d577a8a92cfcf511':
  API changes to enable account selection for a call
 2014-07-17 18:09:28 +00:00
Craig Mautner
dea2119f33 am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 
* commit 'b1c0b0082d535a48d3e916f1a0b70219c84e83c2':
  Wait for all windows to draw before turning screen on
 2014-07-17 18:09:25 +00:00
Martin Kosiba
85bccb55b5 am 92486999: Allow for appending of resources to an AssetManager. 
* commit '92486999f4f34e73df8e31f97b378f8dd66b5aa9':
  Allow for appending of resources to an AssetManager.
 2014-07-17 18:09:21 +00:00
Alexandra Gherghina
2d4b928d63 am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit 'dbfd074444b47f13cfc655142fdc3738bb8136e8':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 18:09:17 +00:00
Amith Yamasani
1457a7626b am 467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 
* commit '467bc0efa37b977abda6349eb75208bf103422e3':
  Keep track of user_setup_complete in DPMS
 2014-07-17 18:09:14 +00:00
Jae Seo
6fce036bed am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 
* commit 'f977db2e87fdc9ba383c3ba808d2ad686a9c26ac':
  TIF: Add TvInputInfo.getParentId
 2014-07-17 18:09:10 +00:00
Kenny Guy
a5824dd5d7 am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev 
* commit '41482465da91ec79cf56d18fc25ebd7533a27489':
  Allow app restrictions for uninstalled packages.
 2014-07-17 18:09:04 +00:00
Chris Craik
4015ed3ee1 am ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev 
* commit 'ec9c58c15d19809827f2cb48df9715433bfa9ed5':
  Initializing variables - generally a good practice
 2014-07-17 18:09:01 +00:00
RoboErik
69b86207bf Merge "return false for media keys if no controller" into lmp-dev 2014-07-17 18:05:14 +00:00
RoboErik
28204a768e return false for media keys if no controller 
bug:16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
 2014-07-17 12:18:32 -07:00
Chris Craik
5d705ee6ad Merge "Minor cleanups around color usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
98d608dba6 Minor cleanups around color usage 
Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
 2014-07-17 12:25:11 -07:00
Chris Craik
6712495297 Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
d36a81f392 Simplify ViewRootImpl's AttachInfo usage 
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba
 2014-07-17 11:14:15 -07:00
John Reck
21f61b7d87 Merge "Fix logging" into lmp-dev 2014-07-17 18:05:14 +00:00
John Reck
5cdb8f998c Fix logging 
Bug: 16357287

Change-Id: Ic14e32c941e42ab1f1ed51ff8ed7185979e57a55
 2014-07-17 18:12:01 +00:00
Jeff Sharkey
69eef8a0d2 Merge "Support cluster-style installs for bundled apps." into lmp-dev 2014-07-17 18:05:14 +00:00
Jeff Sharkey
1e9189a276 Support cluster-style installs for bundled apps. 
Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
 2014-07-17 11:07:12 -07:00
Joe Fernandez
64ae930359 am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:04:47 +00:00
Ruben Brunk
40001f5dac camera2: Fix swapped Face detection commands. 
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
 2014-07-17 18:04:42 +00:00
Sandeep Siddhartha
f8cf71d753 Support model deletion 
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.

We can revisit if we need another deleteSoundModel method

- Also fix an issue with the way we were writing keyphrase to the DB
  and when updating keyphrase, we actually addOrUpdate

Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
 2014-07-17 11:01:25 -07:00