Commit Graph

56613 Commits

Author SHA1 Message Date
Daniel Micay
084ee67b35 fix SeekBarPreference support for summaries
Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.

Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57
2016-03-09 21:50:30 -05:00
Calin Juravle
76ac402779 Merge "Update DexFile.getDexOptNeeded in framework" 2016-03-09 11:57:36 +00:00
Calin Juravle
451ff5a8f3 Merge "Fix VMRuntime.registerAppInfo usage" 2016-03-09 11:57:24 +00:00
Calin Juravle
6ce213fe2c Update DexFile.getDexOptNeeded in framework
Partial cherry pick from commit 693f997cc8

Change-Id: I0fe34541e3cf77fb6e6dbe689b7cf55cb78dbe05
2016-03-08 15:50:19 +00:00
Calin Juravle
9036a97847 Fix VMRuntime.registerAppInfo usage
Partial cherry pick from git commit
d479b52d12

Change-Id: I1de6e7eda23e6029c87896d8c01e063b98e39f74
2016-03-08 15:49:13 +00:00
Adam Powell
68ab418cb4 Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
am: 9d39648de4

* commit '9d39648de4c9070ddc770d301e822bdc72db4ba9':
  Restore auto-launch behavior for ACTION_CHOOSER with a single choice
2016-03-07 23:50:51 +00:00
Adam Powell
9d39648de4 Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice" 2016-03-07 23:46:15 +00:00
Dimitry Ivanov
0e29efd164 Merge "Create linker-namespace for the classloader"
am: c6b66d3fb7

* commit 'c6b66d3fb763f7ebb9c3946377a3008bad315bc3':
  Create linker-namespace for the classloader
2016-03-03 17:08:20 +00:00
Dimitry Ivanov
ea90281082 Create linker-namespace for the classloader
With this change ApplicationLoaders.getClassLoader()
creates linker-namespace for the classloader at the
construction time. Before this change the namespace
was created on first load of a jni library.

With this change we ensure that every classloader
has initialized namespace associated with it.

As an additional advantage we now can avoid storing
namespace-specific fields in the classloaders.

Bug: http://b/27189432
Bug: http://b/22548808
Change-Id: I3b160bd478a55171008682c40b2ebc13bdbd9882
(cherry picked from commit a55c7f15a3)
2016-02-26 10:16:11 -08:00
Dimitry Ivanov
7f849c2cd2 Merge "Construct classloader for apps with no java code"
am: 33e7677665

* commit '33e7677665c38507e58245c92101acef01ff302d':
  Construct classloader for apps with no java code
2016-02-25 19:41:00 +00:00
Dimitry Ivanov
33e7677665 Merge "Construct classloader for apps with no java code" 2016-02-25 19:35:55 +00:00
Dimitry Ivanov
70b6130db7 Construct classloader for apps with no java code
The commit 6f06ad7df1
fixed a way to load native library for NativeActivity
by using classloader logic to find the library; which
also fixed the problem of native activity not working
when library is supposed to be opened directly from
the apk.

As a side effect it introduced regression - apps without
java code did not have correctly initialized classloader.
This change fixes this by constructing classloader with
empty dexpath but valid nativeLibrarySearchPath.

Bug: http://b/26015561
Bug: http://b/27250344
Change-Id: I50f1119f0976a95edd75d88efb9fcdedc57efbc3
(cherry picked from commit b9c9026bdd)
2016-02-23 16:09:24 -08:00
Chien-Yu Chen
660162b8ee Merge "Camera2: Fix getInternalFormatSizes for depth"
am: b999ad9eed

* commit 'b999ad9eed912873feb3fc143f99ba87745d3e06':
  Camera2: Fix getInternalFormatSizes for depth
2016-02-23 01:25:11 +00:00
Chien-Yu Chen
b999ad9eed Merge "Camera2: Fix getInternalFormatSizes for depth" 2016-02-23 01:10:27 +00:00
Chien-Yu Chen
5f1245b993 Camera2: Fix getInternalFormatSizes for depth
All depth formats are considered as non-high-res. Also compare depth
minimum frame durations instead of regular minimum frame durations
for depth formats.

Bug: 26687093
Change-Id: I65b691fe450077b0e3ace15f6ac0289b41caf42f
2016-02-22 14:29:53 -08:00
Colin Cross
bd45c08468 Merge "Add dumpsys meminfo --unreachable"
am: 916ea08119

* commit '916ea081196a47ef3257910a71fa7a7ac609ddb1':
  Add dumpsys meminfo --unreachable
2016-02-19 06:14:50 +00:00
Colin Cross
916ea08119 Merge "Add dumpsys meminfo --unreachable" 2016-02-19 06:10:36 +00:00
Adam Powell
2f6ec22f67 Restore auto-launch behavior for ACTION_CHOOSER with a single choice
For the initial release of Marshmallow auto-launching was suppressed
for ChooserActivity if there was only a single choice in order to let
the user confirm what would be launched. In practice, many apps use
ACTION_CHOOSER when they should probably use implicit intents, but
still others have use cases where setting a default doesn't make sense
and the user should still be able to make a choice when one is
available.

As the user confirmation didn't buy much in terms of developer API
expectations (ACTION_CHOOSER being a forced choice) and it adds
speedbumps to existing apps in the ecosystem, revert this change.

Bug 27243827

Change-Id: Id8fd5385d5b1f459e80b0096efe7e2944264739a
2016-02-18 14:41:41 -08:00
Bill Yi
2528fcdfbd Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD
Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
2016-02-17 11:38:55 -08:00
Amith Yamasani
b96673847a Merge "onAccountsUpdated shouldn't be called back after listener unregistered" 2016-02-12 17:50:17 +00:00
Elliott Hughes
3edfa8f67b The NDK samples moved a while back.
Change-Id: I10f419b0ad58f9c5417a3f06775e298c74f284dc
2016-02-09 16:12:02 -08:00
Colin Cross
84b1e3554b Add dumpsys meminfo --unreachable
dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.

Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
2016-02-08 00:06:34 -08:00
Martijn Coenen
1f4f7190a8 Merge "Improve NFC-F transceive() docs." 2016-02-05 09:38:16 +00:00
Martijn Coenen
6711e02033 Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.

Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
2016-02-05 10:26:16 +01:00
Jakub Pawlowski
c28caad44b Implementation of BluetoothDevice.createBondOutOfBand
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.

Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
2016-02-03 16:12:47 -08:00
Marie Janssen
d63847a866 Merge "IBluetooth: remove dump(), support arguments" 2016-01-27 20:42:07 +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
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
b7fbe1104f Merge "NullPointerException when starting VoiceInteractionManagerService" 2016-01-23 02:09:36 +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
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
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
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