Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
214,255 Commits 3 Branches 0 Tags
f3c5230bf36401e9c8be718a9f2e620ba77e55bd
Commit Graph

56608 Commits

Author SHA1 Message Date
Marie Janssen
f3c5230bf3 Merge "IBluetooth: remove dump(), support arguments" 
am: d63847a866

* commit 'd63847a86680df271cc518a6baaac30a7e07c9f5':
  IBluetooth: remove dump(), support arguments
 2016-01-27 20:49:55 +00:00
Marie Janssen
d63847a866 Merge "IBluetooth: remove dump(), support arguments" 2016-01-27 20:42:07 +00:00
Dimitry Ivanov
e057ed6b6b Merge "Remove path to the apk from the permittedPath" 
am: 5194d217b8

* commit '5194d217b81f7375f4d60c35b604bac8bffc51e7':
  Remove path to the apk from the permittedPath
 2016-01-25 18:16:44 +00:00
Chad Brubaker
8500093a35 Merge "Add getApplicationConfigForPackage" 
am: 7519dce8c2

* commit '7519dce8c2742b8abcc884a930552c8372b777fd':
  Add getApplicationConfigForPackage
 2016-01-25 18:14:39 +00:00
Dimitry Ivanov
5194d217b8 Merge "Remove path to the apk from the permittedPath" 2016-01-25 18:04:18 +00:00
Chad Brubaker
7519dce8c2 Merge "Add getApplicationConfigForPackage" 2016-01-25 18:03:13 +00:00
Martijn Coenen
cf2f9d0966 Merge "Implementation of HCE for NFC-F." 
am: e168012ff2

* commit 'e168012ff21408f8be85040bb4ac977061519f62':
  Implementation of HCE for NFC-F.
 2016-01-25 09:56:20 +00:00
Martijn Coenen
e168012ff2 Merge "Implementation of HCE for NFC-F." 2016-01-25 09:48:43 +00:00
Chad Brubaker
056e8b5a5a Add getApplicationConfigForPackage 
This allows services which make network connections on behalf of
applications to honor the application's network security policy.

Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
 2016-01-22 22:04:20 -08:00
Jorim Jaggi
5d6da4eab0 Merge "NullPointerException when starting VoiceInteractionManagerService" 
am: b7fbe1104f

* commit 'b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
  NullPointerException when starting VoiceInteractionManagerService
 2016-01-23 02:18:13 +00:00
Jorim Jaggi
b7fbe1104f Merge "NullPointerException when starting VoiceInteractionManagerService" 2016-01-23 02:09:36 +00:00
Thierry Strudel
afbf1570ac Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 
am: e8b476e8e8

* commit 'e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:28:41 +00:00
Thierry Strudel
e8b476e8e8 Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev 
am: 0064c4c793

* commit '0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:20:30 +00:00
Dimitry Ivanov
ee5a181371 Remove path to the apk from the permittedPath 
Bug: http://b/26732624
Bug: http://b/22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
 2016-01-22 13:20:29 -08:00
Yoshinobu Ito
c52adfe124 Implementation of HCE for NFC-F. 
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.

Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
               Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>

Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
 2016-01-22 18:14:18 +09:00
Thierry Strudel
b786aaa5a7 Don't assume kernel tick is 100Hz 
Bug: 26729731
Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
 2016-01-21 16:31:21 -08:00
Marie Janssen
0c04ccd952 IBluetooth: remove dump(), support arguments 
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().

Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
 2016-01-21 23:53:37 +00:00
Sergio Giro
e2296d490d Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 
am: eb93182dfb

* commit 'eb93182dfb862df27e479d30c7b8e12f13e5def5':
  org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
 2016-01-21 17:20:41 +00:00
Sergio Giro
eb93182dfb Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 2016-01-21 17:08:21 +00:00
Sergio Giro
ab72367506 org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser 
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.

Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
 2016-01-21 17:04:58 +00:00
Matthew Williams
88d641ce26 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a am: 85f169d19f am: c77a2228aa 
am: 4cc10825f0

* commit '4cc10825f0234d365016a18e1f86d61cbd2fd030':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:44:07 +00:00
Matthew Williams
4cc10825f0 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a am: 85f169d19f 
am: c77a2228aa

* commit 'c77a2228aa66a1d2b1e497c193604de0717ec3c7':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:38:50 +00:00
Matthew Williams
c77a2228aa Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a 
am: 85f169d19f

* commit '85f169d19f200daa35a30652905d6daf090955c6':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:31:19 +00:00
Matthew Williams
85f169d19f Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 
am: ce3842eb1a

* commit 'ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:08:33 +00:00
Matthew Williams
ce3842eb1a Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c 
am: 0f292147f3

* commit '0f292147f3ac803a8701afd7362ad3e0487fd496':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:55:52 +00:00
Matthew Williams
0f292147f3 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e 
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:32:56 +00:00
Sanket Agarwal
cf19b76f27 Merge "Add support for AVRCP 1.3." 
am: 168f2e556b

* commit '168f2e556b7222fd0dab7eadc4ceee2eca13be1a':
  Add support for AVRCP 1.3.
 2016-01-20 01:25:04 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698)
 2016-01-20 00:02:58 +00:00
Sanket Agarwal
ba12af5167 Add support for AVRCP 1.3. 
* Add metadata support.
* Add player settings support.
* Add playback support.

A2DP Settings App support.

Bluetooth: A2DP Sink support for Settings App

- add support for A2DP Sink in Settings App. This will enable connection
  initiation and updation on Settings App
- add framework Apis to support A2DP Sink. Any third party Apps can access
  A2DP Sink priority of device and playing state of device
- add support for key to set priority. This manages priority of device for
  A2DP Sink profile

Change-Id: If5f9139f37cdb9d200387877c7801075205c78a0
 2016-01-19 14:37:18 -08:00
Neil Fuller
f19a33a070 Merge "Add thread safety documentation" 
am: b3ea05a56e

* commit 'b3ea05a56ea980541d328ab7534a2da230d62c06':
  Add thread safety documentation
 2016-01-15 16:36:34 +00:00
Neil Fuller
69c2907c63 Merge "Fix @code escapes" 
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
 2016-01-15 16:31:40 +00:00
Neil Fuller
2c9d40a06e Add thread safety documentation 
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.

Bug: 25767152
(cherry-picked from commit bf0dc0fba7)

Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
 2016-01-15 16:26:26 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes 
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
 2016-01-15 16:14:57 +00:00
Alan Viverette
c8ef3f8730 Don\'t verify the scrollbar drawable am: a53c3b2197 
am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable
 2016-01-14 21:49:09 +00:00
Alan Viverette
ca6b87fea6 Don\'t verify the scrollbar drawable 
am: a53c3b2197

* commit 'a53c3b2197b73d5b6a697ae2077e04065df84d9e':
  Don't verify the scrollbar drawable
 2016-01-14 21:44:31 +00:00
Alan Viverette
a53c3b2197 Don't verify the scrollbar drawable 
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
 2016-01-14 21:07:13 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d 
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:29:13 +00:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:24:48 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
 2016-01-14 01:26:05 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b 
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f 
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:10:29 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:01:29 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00