212140 Commits

Author SHA1 Message Date
Svetoslav Ganov
9ae3aeec53 Merge "Revert "Take into account default app for default grants"" 2015-11-06 00:24:59 +00:00
Svetoslav Ganov
d2bbf1bf0a Revert "Take into account default app for default grants"
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.

This reverts commit fce33d58d87fd494686aae4e21332b58ec260b73.

Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
2015-11-06 00:24:47 +00:00
Tenghui Zhu
3226c57321 Merge "When the incoming light source is invalid, don't generate any shadow" 2015-11-05 23:56:56 +00:00
Teng-Hui Zhu
83ea5b7b22 When the incoming light source is invalid, don't generate any shadow
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
2015-11-05 15:48:35 -08:00
Chad Brubaker
80a73f5939 Use a builder for NetworkSecurityConfig
The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.

Change-Id: I054af83451e52761227479eadf9cb9803437505f
2015-11-05 12:50:30 -08:00
Dan Albert
22b7e496c2 Merge "Use std::unique_ptr instead of UniquePtr." 2015-11-05 19:32:43 +00:00
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Brian Carlstrom
ffb15da518 Merge "Fixes for sm and pm usage" 2015-11-05 18:38:56 +00:00
Brian Carlstrom
82bfca4609 Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"

Bug: 20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
2015-11-05 10:33:40 -08:00
Stephen Hines
eebe899f5d Remove unsupported RS graphics API tests.
Bug: 25497185

These tests all use deprecated graphics APIs along with unsupported
pragmas. Removing them first will make our pragma cleanup simpler.

Change-Id: Icd0f2690d79dd8deb709724b47607483d6e3dea2
2015-11-05 10:31:10 -08:00
Dan Albert
d9a1b35df6 Merge "Don't apply clang flag to gcc builds." 2015-11-05 18:18:45 +00:00
Masaaki Iwaguchi
86d13f3daf Avoid NPE in printspooler when changing language
PrintActivity is recreated when the language setting is changed.
As a result of the recreation mCurrentPrinter is null, which causes
a NullPointerException when onActivityResult() is called.

The issue is solved with a simple null check.

Change-Id: Ic58f0ca01577d2ec02d494739f3bc2f06240dd44
2015-11-05 17:39:21 +00:00
Dan Albert
0eadf57cad Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
2015-11-05 00:59:09 -08:00
Dan Albert
b0624da118 Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.

Bug: http://b/22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
2015-11-05 00:57:12 -08:00
Svetoslav Ganov
82eeb2f20c Merge "Take into account default app for default grants" 2015-11-05 02:19:12 +00:00
Svetoslav Ganov
035374d7a2 Merge "Enforce weaker grant if app is default handler for miltiple action" 2015-11-05 02:19:00 +00:00
Svetoslav
5db602fd19 Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
2015-11-05 02:18:13 +00:00
Chad Brubaker
6bc1e3966c Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.

This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
  certificate pinning.
* Policy on what to do with cleartext traffic.

In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.

This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.

Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
2015-11-04 14:31:18 -08:00
Glenn Kasten
ebbdabdb82 Merge "Built-in mic is not used when USB mic is disconnected" 2015-11-04 16:03:41 +00:00
Alejandro Ochoa
46b434ff98 Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).

Bug: 24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
2015-11-04 15:58:09 +00:00
Calin Juravle
8e6714ba2b Remove obsolete profile handling from AndroidRuntime.
Bug: 24698874
Change-Id: I61193800e8b1f285b0a8edd05a0430a3c779e5b1
2015-11-04 14:54:37 +00:00
Wale Ogunwale
d89b76a58d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
am: 7810aed854

* commit '7810aed85408bddc4cc0c65e5be8d082c638d995':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
2015-11-03 15:13:24 +00:00
Wale Ogunwale
7810aed854 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." 2015-11-03 15:09:32 +00:00
joanne_chung
a084fb7b93 [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Symptom:
NullPointerException crash while call startNextMatchingActivity.

Root Cause:
Activity starts with FLAG_DEBUG_LOG_RESOLUTION for debug dump.
If the current Activity is the last object of resolves list,
  we can not get the next Activity and aInfo is still null.

Solution:
Check null in debug log dump.

Change-Id: I4c5d14d9acd8d47768b36c95354763841579e050
2015-11-03 11:36:41 +08:00
Svetoslav
fce33d58d8 Take into account default app for default grants
Use the correct API to query activities when granting
default permissions to ensure the preferred apps are
taken into account. This allows OEMs to customize which
app should get default permission grants if there is
more than one resolving to the query intent.

Change-Id: I047f22dfff773a2ba9de1a0144442e372607777c
2015-11-02 16:41:57 -08:00
Glenn Kasten
613c63c742 Merge "BluetoothMidiDevice: change write type to support JamStik"
am: 6079b990f1

* commit '6079b990f1461011a9dedb47cc65db1ce062e199':
  BluetoothMidiDevice: change write type to support JamStik
2015-11-02 23:06:04 +00:00
Glenn Kasten
bd32753700 Merge "BLE-MIDI: change binding for BluetoothMidiService"
am: 5831944a6e

* commit '5831944a6e99eff746e70d6ee9532ec3e3f32918':
  BLE-MIDI: change binding for BluetoothMidiService
2015-11-02 23:04:42 +00:00
Glenn Kasten
d8a8500429 Merge "MidiBluetoothService: add new device to HashMap"
am: 9b07ba4bc3

* commit '9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
  MidiBluetoothService: add new device to HashMap
2015-11-02 23:03:18 +00:00
Glenn Kasten
58f41c3b76 Merge "MidiManager: fix double BTLE callback"
am: bbf34d0bd1

* commit 'bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
  MidiManager: fix double BTLE callback
2015-11-02 23:01:49 +00:00
Glenn Kasten
350dc16475 Merge "MidiService: update listener with current status when registered"
am: d4e9b9e4ac

* commit 'd4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
  MidiService: update listener with current status when registered
2015-11-02 23:00:15 +00:00
Glenn Kasten
6079b990f1 Merge "BluetoothMidiDevice: change write type to support JamStik" 2015-11-02 22:51:29 +00:00
Glenn Kasten
5831944a6e Merge "BLE-MIDI: change binding for BluetoothMidiService" 2015-11-02 22:51:18 +00:00
Glenn Kasten
9b07ba4bc3 Merge "MidiBluetoothService: add new device to HashMap" 2015-11-02 22:51:12 +00:00
Glenn Kasten
bbf34d0bd1 Merge "MidiManager: fix double BTLE callback" 2015-11-02 22:51:02 +00:00
Glenn Kasten
d4e9b9e4ac Merge "MidiService: update listener with current status when registered" 2015-11-02 22:50:50 +00:00
Phil Burk
d11e59ec6b BluetoothMidiDevice: change write type to support JamStik
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
2015-11-02 13:31:29 -08:00
Phil Burk
ff23e1b4cb BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
2015-11-02 13:31:29 -08:00
Phil Burk
2e48f1b96e MidiBluetoothService: add new device to HashMap
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit e5f722e55c5708c2b48b8c9688c135e451225032)
2015-11-02 13:31:29 -08:00
Phil Burk
a471e2cf8c MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
2015-11-02 13:31:29 -08:00
Phil Burk
3698fca0dc MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit b2355940e3e697deeecd1b6511cd5094f9dc553a)
2015-11-02 13:31:29 -08:00
Wale Ogunwale
6c8b91d8c2 Merge "[ActivityManager] Fix IndexOutOfBoundsException"
am: a61515720a

* commit 'a61515720ab95f6aa307c1fa4337c5c2078bad26':
  [ActivityManager] Fix IndexOutOfBoundsException
2015-10-27 15:19:56 +00:00
Wale Ogunwale
a61515720a Merge "[ActivityManager] Fix IndexOutOfBoundsException" 2015-10-27 15:12:56 +00:00
louis_chang
8f0555ac55 [ActivityManager] Fix IndexOutOfBoundsException
Symptom:
The stack was deleted during cleanup, so the stack
list size has reduced by one and cause this issue.

IndexOutOfBoundsException: Invalid index 1, size is 1

Change-Id: Ic6722aed98a0ad789b331d00e89cb74bf3b36d4c
2015-10-27 10:45:53 +08:00
Julia Reynolds
c7839bde7c Merge "SystemUI: Reload the EndNowButton label"
am: 40b52bbe48

* commit '40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
  SystemUI: Reload the EndNowButton label
2015-10-26 15:05:34 +00:00
Julia Reynolds
40b52bbe48 Merge "SystemUI: Reload the EndNowButton label" 2015-10-26 14:57:34 +00:00
Johan Redestig
f2d824fd56 SystemUI: Reload the EndNowButton label
Reload the EndNowButton label when configuration
changes.

Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
2015-10-26 15:51:23 +01:00
Neil Fuller
c08debc23a Merge "Adjust for changes to libcore/Docs.mk"
am: f5e3398596

* commit 'f5e33985964c3e7acf6b9cd16d94a110e4f9a42d':
  Adjust for changes to libcore/Docs.mk
2015-10-26 10:11:23 +00:00
Neil Fuller
f5e3398596 Merge "Adjust for changes to libcore/Docs.mk" 2015-10-26 10:04:30 +00:00
Kenny Root
b0cc47efe5 Merge "Add Workman keyboard layout"
am: 9a65c36022

* commit '9a65c36022482d7fd4217e537fa434cc79b69f39':
  Add Workman keyboard layout
2015-10-23 23:39:24 +00:00
Kenny Root
9a65c36022 Merge "Add Workman keyboard layout" 2015-10-23 23:32:01 +00:00