Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
93f8965768 am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit 'ab6e9048ebe2ac6cd4897378b56017267d6ee16e':
  docs: Add more information for getting started with TV app
 2014-11-06 04:23:30 +00:00
Dirk Dougherty
d7476cf42f Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 2014-11-06 04:22:11 +00:00
Joe Fernandez
ab6e9048eb am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '2490ec83702985bd70ac2d28322dc5c9625dc26a':
  docs: Add more information for getting started with TV app
 2014-11-06 04:14:26 +00:00
Dirk Dougherty
0ce73219be Doc change: Add play dev guide page with index card and shareable download. 
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
 2014-11-05 20:14:15 -08:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Paul Lawrence
70c9a06af0 DO NOT MERGE: Don't log passwords returned from vdc 
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
 2014-11-05 19:07:57 -08:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
mike dooley
3f60f6c084 am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '9beb54db9ef78c23dd06822a6e3426d6374b26c2':
  Adding method to get disconnect cause from conference
 2014-11-06 03:01:54 +00:00
Jim Miller
6230cdf572 am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '262dc4dafede871712d89f35d630ab2a332ee6cb':
  Update TrustAgentService API after review
 2014-11-06 02:57:39 +00:00
mike dooley
9beb54db9e am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '6b93e2b02620034e79cb3bdf6d543c3f96abadd7':
  Adding method to get disconnect cause from conference
 2014-11-06 02:55:28 +00:00
Jeff Tinker
9e522f3432 am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit '0d8d6ba807078b70eae53e676443ef5ac7598560':
  Add missing secure stop methods
 2014-11-06 02:54:57 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Jeff Tinker
0d8d6ba807 am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit 'e7f66ada24c2b4098e9fea1c07d570543149c806':
  Add missing secure stop methods
 2014-11-06 02:49:08 +00:00
mike dooley
6b93e2b026 am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '8355c500ea6f809ef2e6885aee673d39f1cb223b':
  Adding method to get disconnect cause from conference
 2014-11-06 02:48:58 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00
Jeff Tinker
e7f66ada24 am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit 'fc4e6f70f64676ab375c3e233b6c07e3bc56cb64':
  Add missing secure stop methods
 2014-11-06 02:39:11 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Yuncheol Heo
a95f1a9b89 CEC: Don't send <Feature Abort> on the short message 
Bug: 18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
 2014-11-06 11:27:25 +09:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
Jeff Davidson
83bdea71c9 am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
automerge: f680c84

* commit 'f680c8434a737873c98231f6d9863e71c43a6783':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 02:09:10 +00:00
Jeff Davidson
f680c8434a am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
* commit '63226dd8f3570bd3b28e4241668843385ba99c2d':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:48:45 +00:00
Jeff Davidson
63226dd8f3 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 
automerge: 24f535b

* commit '24f535b87341b8729d6d4235acc51f0e87916d3a':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:32:55 +00:00
Joe Fernandez
2490ec8370 Merge "docs: Add more information for getting started with TV app" into lmp-docs 2014-11-06 01:31:56 +00:00
Joe Fernandez
9fe42219c6 docs: Add more information for getting started with TV app 
- required manifest entries
- more information on permissions that imply hardware features

Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
 2014-11-05 17:29:31 -08:00
Jeff Davidson
24f535b873 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 2014-11-06 01:25:04 +00:00
George Mount
427c64140d Make setOutlineProvider change transitionGroup. 
Bug 18203878

Change-Id: Ia343477b8b37566e0fd8fd1a275b56e805bb18dc
 2014-11-05 16:57:41 -08:00
Winson Chung
b0a28ea5d3 Don't reload the layout every time we enter Recents. (Bug 18160176) 
Ensure that we don't reinflate new TaskViews whenever we enter Recents by
keeping the existing TaskStackViews active and returning the existing
TaskViews back into the view pool when Recents is no longer visible.

This CL also ensures that we are preloading the appropriate task metadata
when the user first touches the nav bar, and also reverts the change to use
onEnterAnimationComplete() in favor of the explicitly animation-started
broadcast (to ensure we always get the signal) which fixes a regression
with launching Recents in landscape.

Change-Id: I169fea3cf07a6da3f90b32b005819773c6049ada
 2014-11-05 16:39:13 -08:00
Robert Greenwalt
ed9fb4a122 am c47a9127: am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'c47a91273c42a2ebd9f6e154d99dcdc51a185609':
  Fix Legacy typing of net-specific requests.
 2014-11-06 00:12:52 +00:00
Jeff Davidson
e40ea96f97 am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit 'a45e98974e571ca539436b295a98d513faa10d19':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-06 00:12:44 +00:00
George Mount
ac418e07f7 am a3fdc18f: am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'a3fdc18fd7a8191d7452e63823d7c4589dd5c894':
  Cancel animation when target changes.
 2014-11-06 00:12:39 +00:00
Jeff Hao
2e594cfe98 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Bug: 18247218

(cherry picked from commit 9f60c08a44)

Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
 2014-11-05 23:51:42 +00:00
Justin Koh
b8038d58da Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 2014-11-05 23:49:04 +00:00
Amith Yamasani
7d2d4fd55e Fix singleUser provider grants 
Fake the Uri for grant check, if we're checking access to
a singleUser provider. Inject the userId in the authority
so that the grant can be matched properly.

Bug: 18194892
Change-Id: I4a55ce593ac21722f394e89e13350aa205d76336
 2014-11-05 15:46:09 -08:00
Robert Greenwalt
c47a91273c am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'a4f34eddb3b46a81ce90a9eded54b35b62e40337':
  Fix Legacy typing of net-specific requests.
 2014-11-05 23:45:03 +00:00
Robert Greenwalt
a4f34eddb3 am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit '7efdb83ceeea3dc916f8a05f59f7b35cb8d13597':
  Fix Legacy typing of net-specific requests.
 2014-11-05 23:40:35 +00:00
Robert Greenwalt
7efdb83cee Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 2014-11-05 23:36:01 +00:00
Jeff Davidson
a45e98974e am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-05 23:19:44 +00:00
George Mount
a3fdc18fd7 am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'aa6270375263ebf6da4f2f0de31df808eb278563':
  Cancel animation when target changes.
 2014-11-05 23:15:00 +00:00
Jeff Davidson
8cae7f644c am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit '8fe7676ee80019b3efc3369f9c9d9631047d58ef':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-05 23:14:26 +00:00
Jeff Davidson
8fe7676ee8 Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 2014-11-05 23:10:57 +00:00
George Mount
aa62703752 am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'c838b677749e0c20fc201b0418864be3835711b8':
  Cancel animation when target changes.
 2014-11-05 23:08:24 +00:00
Stuart Scott
bc6a9601d7 Fix NPE when parceling SubInfoRecord 
bug:18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
 2014-11-05 15:07:54 -08:00
Robert Greenwalt
06314e4eab Fix Legacy typing of net-specific requests. 
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not.  Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
 2014-11-05 15:06:20 -08:00
George Mount
c838b67774 Merge "Cancel animation when target changes." into lmp-mr1-dev 2014-11-05 23:04:18 +00:00
Dirk Dougherty
c6f2ec20a6 am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit 'b2fe15f9bf6ea06bd4c862547f830c355d95c60a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-05 22:57:36 +00:00
Dirk Dougherty
b2fe15f9bf am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit '662964511f88fddbf14941c66bf255acb3f30e2a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-05 22:51:31 +00:00
Dirk Dougherty
662964511f Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 2014-11-05 22:44:23 +00:00
Rob Tsuk
dfd0099ce5 am fce461ea: am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'fce461eada9f0f03cd30e3a5fcb60072d589049a':
  Log shader source when it fails to compile
 2014-11-05 22:35:46 +00:00
Rob Tsuk
fce461eada am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'db6a1358d45430a952aa746f8dfd452d12d7e4be':
  Log shader source when it fails to compile
 2014-11-05 22:31:05 +00:00
Rob Tsuk
db6a1358d4 am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit '6c96cbf581bf97b034e4c65eabe3c0fe8d930bfa':
  Log shader source when it fails to compile
 2014-11-05 22:26:11 +00:00