213061 Commits

Author SHA1 Message Date
Baligh Uddin
a1d63092b7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I55bd76c512148127b06a36950cf66da55c9295dc
2015-11-04 15:39:05 -08:00
Baligh Uddin
e22fb216ee Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
2015-11-04 15:36:55 -08:00
Baligh Uddin
a1065cf5d9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
2015-11-04 15:34:55 -08:00
Baligh Uddin
8ff8892c12 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
2015-11-04 15:32:37 -08:00
Baligh Uddin
7ca7920f8d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
2015-11-04 15:30:29 -08:00
Baligh Uddin
87428865b2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
2015-11-04 15:28:25 -08:00
Baligh Uddin
5bc5bb57f3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
2015-11-04 15:26:15 -08:00
Baligh Uddin
29aa638aec Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I31e759c6b0da2ecb71418aa3033f832a9ee42250
2015-11-04 15:24:05 -08: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
Baligh Uddin
185269d3e9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
2015-11-04 11:56:04 -08:00
Baligh Uddin
3a68edba5c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
2015-11-04 11:51:55 -08:00
Glenn Kasten
1104180301 Merge "Built-in mic is not used when USB mic is disconnected"
am: ebbdabdb82

* commit 'ebbdabdb826c083769e7d7bc102a59a04c9e0329':
  Built-in mic is not used when USB mic is disconnected
2015-11-04 16:10:44 +00: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
Bill Yi
2e8c3c11b7 Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD 2015-11-03 14:29:59 -08: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
Lorenzo Colitti
bce5116b8d Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9
am: c52503acf0

* commit 'c52503acf0a5e4140376391f57de539fbe60ea8f':
  Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:16:31 +00:00
Lorenzo Colitti
c52503acf0 Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d
am: e4aacaeec9

* commit 'e4aacaeec950691700d717efa894a7b51bc87fe2':
  Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:09:27 +00:00
Lorenzo Colitti
e4aacaeec9 Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am: a2cc04736d

* commit 'a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
  Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:02:31 +00:00
Lorenzo Colitti
a2cc04736d Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev 2015-10-29 07:57:13 +00:00
Bryce Lee
698b33ea7f Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d
am: 3b6f9f78cf

* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:23:06 +00:00
Bryce Lee
3b6f9f78cf Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
am: 4636770f0d

* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:16:07 +00:00
Bryce Lee
4636770f0d Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev 2015-10-29 07:10:15 +00:00
Lorenzo Colitti
7611f1cdb4 Don't crash if a DHCP server doesn't send the server ID option.
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.

Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
2015-10-29 16:09:16 +09:00
Bryce Lee
dc13382622 Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
2015-10-28 22:21:54 -07:00
Bryce Lee
8faa19c826 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81
am: 2adf45bee0

* commit '2adf45bee0b423fa6ca758b806a16b968c0a3c65':
  Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:19:19 +00:00
Bryce Lee
2adf45bee0 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
am: 0a80294c81

* commit '0a80294c81d86a8bcdc6545b6e31929645cab306':
  Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:10:41 +00:00
Bryce Lee
0a80294c81 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev 2015-10-29 05:04:06 +00:00
Bryce Lee
70d4210e2e Revert "Declare new interface for headset client bluetooth profile to query."
This reverts commit 694251eaaa8ea70a9b0427d55e9ede437c83a6d5.

Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
2015-10-29 04:58:38 +00:00
Bryce Lee
2b47b6eed2 Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee
am: 8b4f21b108

* commit '8b4f21b108828c08833767c1f3f908e1cd7f8477':
  Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:53:01 +00:00
Bryce Lee
8b4f21b108 Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am: a841973dee

* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
  Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:45:09 +00:00