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

172227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ddb7653abd Import translations. DO NOT MERGE 
Change-Id: Ic184c5ac9f0ef908ed5fec4afefb7cec8ce8e8ad
Auto-generated-cl: translation import
 2014-11-07 01:29:06 -08:00
Nicolas Prevot
1985f4963a am aa1185dc: am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'aa1185dc44347d1af713ec78b4a294683758b806':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:25:55 +00:00
Yuncheol Heo
4034241d99 am fb981efb: am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit 'fb981efbd0ba116433fc869ce3b1370a946eb057':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:25:51 +00:00
Nicolas Prevot
aa1185dc44 am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'ea728d75ebb228822690365d147fc4021fb87ce9':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:20:57 +00:00
Yuncheol Heo
fb981efbd0 am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit '9188df6ef00a05fc15f2acf290e40c389ec7c847':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:20:51 +00:00
Nicolas Prevot
ea728d75eb Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev 
automerge: b9744c1

* commit 'b9744c1c1f5e8cc936da7f1832665f77ad5bb18f':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 10:22:13 +00:00
Yuncheol Heo
9188df6ef0 CEC: Allow no parameters with <System Audio Mode Request>. 
automerge: 0361147

* commit '03611473bc1d13f8e55ac92e37a9716c2fd8e412':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 10:21:09 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>. 
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
 2014-11-06 08:27:58 +00:00
Sailesh Nepal
55c3de783b am a4b3d3d3: am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'a4b3d3d32f924bf29ba081aae8528cf617742667':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:26:32 +00:00
Sailesh Nepal
a4b3d3d32f am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit '8fafe7b454c27e1ba2850c04e8ef4e16795e13fb':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:21:56 +00:00
Sailesh Nepal
8fafe7b454 am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'db66e1d2b9b63eb1612820dc6572de1e42880646':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:17:54 +00:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Yuncheol Heo
02d5ee944f am 472cfdb9: am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit '472cfdb967a3ead8bf41e0845897e8a8a338e7c3':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 06:03:28 +00:00
Yuncheol Heo
472cfdb967 am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'd87c32aa859ef54c6bce923c52725edf44538488':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:58:53 +00:00
Yuncheol Heo
d87c32aa85 am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'ff636d383c8f0464e543866ae73ec4a367efd15a':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:53:31 +00:00
Yuncheol Heo
ff636d383c Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev 2014-11-06 05:47:49 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause 
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
 2014-11-05 21:02:37 -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
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
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
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
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
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
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