Commit Graph

63780 Commits

Author SHA1 Message Date
Makoto Onuki
8b2ee3d611 Fix system crash due to mismatching begin/finishBroadcast() am: 7bdb9ce978 am: f3c4729947
am: 47fc09457d

Change-Id: Ied3686b611a73b78d50d5737ec65522bfef6f63f
2016-09-16 17:43:25 +00:00
Makoto Onuki
47fc09457d Fix system crash due to mismatching begin/finishBroadcast() am: 7bdb9ce978
am: f3c4729947

Change-Id: Icbbc6521164e376501ec2473f40babf9aeb13462
2016-09-16 17:32:05 +00:00
Makoto Onuki
f3c4729947 Fix system crash due to mismatching begin/finishBroadcast()
am: 7bdb9ce978

Change-Id: I032370f8bdf9f6c0f7e75253b7f3950795f359ab
2016-09-16 17:24:52 +00:00
Julia Reynolds
90eba6d81c Merge "Add Notification channels" 2016-09-16 15:35:27 +00:00
Gopal Krishna Shukla
09e3236fff Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77 am: d3e1e473df am: e790c7b2fe
am: 2ef54a4f2b

Change-Id: I627dc54315c3dd5a958a89141dc999b40c921af6
2016-09-16 05:46:37 +00:00
Gopal Krishna Shukla
2ef54a4f2b Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77 am: d3e1e473df
am: e790c7b2fe

Change-Id: I55465d3d95a317c7fdcff99298e89408190e67e3
2016-09-16 05:41:34 +00:00
Gopal Krishna Shukla
e790c7b2fe Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77
am: d3e1e473df

Change-Id: Iad174757bbb77ce2eef4bd39fd218b64f6e35931
2016-09-16 05:36:36 +00:00
Gopal Krishna Shukla
d3e1e473df Merge "Remove synchronization from getCurrentInputMethodSubtype()"
am: 85539bed77

Change-Id: I0f564ebcb74d4c17a4d18ab2fe8660c977731590
2016-09-16 05:31:29 +00:00
Gopal Krishna Shukla
fa1886feea Remove synchronization from getCurrentInputMethodSubtype()
getCurrentInputMethodSubtype() acquires InputManagerService.mMethodMap
within its body. There seems to be no reason for holding
InputMethodManager.mH to call getCurrentInputMethodSubtype(). Holding mH
can cause potential deadlock b/w two threads acquiring mH and mMethodMap
in different orders.

Bug: 31247871
Bug: 31273203
Bug: b.android.com/218423
Change-Id: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
2016-09-16 03:41:46 +00:00
Phil Weaver
28cb1f9026 Merge "Remove unused aidl file." 2016-09-15 23:09:03 +00:00
Manu Cornet
a7cf4dd1af Merge "Include window location after encoded view hierarchy" 2016-09-15 22:51:12 +00:00
Patrick Baumann
81f65fe3eb Adding advanced pattern support to PatternMatcher am: 2baf095ca9 am: 564d936eb1
am: c14db5b2de

Change-Id: I6bc888ffcb625ee109a2fecdbd8becb58b545c66
2016-09-15 21:39:09 +00:00
Patrick Baumann
c14db5b2de Adding advanced pattern support to PatternMatcher am: 2baf095ca9
am: 564d936eb1

Change-Id: I1c3619477b56c583c3d85f2185a1381676136293
2016-09-15 21:34:18 +00:00
TreeHugger Robot
84024c1f09 Merge "Allow Condition Providers to bind/unbind themselves" 2016-09-15 21:29:10 +00:00
Patrick Baumann
564d936eb1 Adding advanced pattern support to PatternMatcher
am: 2baf095ca9

Change-Id: Id4e05a79797af961e6505715b69da4319f2042cc
2016-09-15 21:28:27 +00:00
Phil Weaver
ab14ee01c4 Remove unused aidl file.
Also removing an unused import in another.

Change-Id: Ib620189aefd85f8b12bb9d5d88b07798126e2b58
2016-09-15 14:11:05 -07:00
Manu Cornet
4d052b3b51 Include window location after encoded view hierarchy
Change-Id: I4e60e354dc56742bbd7dd52eb2191659d3453b29
2016-09-15 13:59:43 -07:00
TreeHugger Robot
e74a1b192b Merge "Delete L->M upgrade code." 2016-09-15 20:05:21 +00:00
Makoto Onuki
7bdb9ce978 Fix system crash due to mismatching begin/finishBroadcast()
Bug 31449363

Change-Id: I514196355a2566c5e4f7f3af91fbf3c57cb67a48
2016-09-15 12:59:43 -07:00
Phil Weaver
be2b372069 Merge "Reduce overhead of obtain/recycle a11y checking." 2016-09-15 19:53:31 +00:00
Julia Reynolds
38e6ca4e74 Allow Condition Providers to bind/unbind themselves
So they only run when needed.

Change-Id: I5cf3a572837cb773dcb4f278a9f86a9d909147e4
Fixes: 30727598
2016-09-15 19:31:29 +00:00
Julia Reynolds
88dabdeeb2 Animate volume slider changes.
Change-Id: I03f83d25eeb2ef30346c377d6b4fcb8688faaffc
Fixes: 30670594
2016-09-15 18:47:21 +00:00
TreeHugger Robot
0c76907fc4 Merge "resolve merge conflicts of b97129e to master" 2016-09-15 18:24:46 +00:00
Patrick Baumann
2baf095ca9 Adding advanced pattern support to PatternMatcher
This change adds a new pathMatch attribute to the intent-filter tag
that supports a subset of regular expression syntax. Supported
tokens include dot (.) and set ([]) and supported modifiers include
zero-or-more (*), one-or-more(+) and ranges ({}).

Change-Id: I2ec3bc8a9eb3e94d21caf34a1ed0f3fd3fb33a35
Bug: 30805203
2016-09-15 11:17:54 -07:00
Julia Reynolds
206c7e9d83 Delete L->M upgrade code.
Bug: 25497753
Change-Id: I0ae55e0d49b0aa488b86e336a6246fe57cba8601
2016-09-15 18:06:36 +00:00
Phil Weaver
62d20fabf2 Reduce overhead of obtain/recycle a11y checking.
Change-Id: I643ab028aa23c4727b9e0be0db83238034a23960
2016-09-15 11:05:55 -07:00
Julia Reynolds
04499531c2 Make docs match reality.
Change-Id: I51cc6a1e18e9e17284a7afbf0c13257d0de22d5b
Fixes: 30769600
Fixes: 30908728
2016-09-15 16:52:17 +00:00
Lorenzo Colitti
8d4d235a06 resolve merge conflicts of b97129e to master
Change-Id: Ib09134090aa135d88bb807034b262a23c8b40e5f
2016-09-16 01:45:15 +09:00
Lorenzo Colitti
81493a9fef Support displaying a dialog when wifi becomes unvalidated. am: 9be58c5580 am: d660913b0b
am: 56e32083b5

Change-Id: Id908683dce15ffbafc042d506a38ec26d5e9a6ee
2016-09-15 16:18:42 +00:00
Philip P. Moltmann
2c6fe63b4c Merge "Set buffer before UsbRequest is queued" 2016-09-15 16:17:50 +00:00
Lorenzo Colitti
56e32083b5 Support displaying a dialog when wifi becomes unvalidated. am: 9be58c5580
am: d660913b0b

Change-Id: I3ccd36e2ea516b56176bc776e3bd4567bb5c18e3
2016-09-15 16:12:01 +00:00
Lorenzo Colitti
d660913b0b Support displaying a dialog when wifi becomes unvalidated.
am: 9be58c5580

Change-Id: I8b8e2b652510ca75407a9ad3c29ed111367941e0
2016-09-15 16:04:03 +00:00
Hugo Benichi
744c370b7c Support ignoring penalty for bad wifi networks am: c8e9e1229a am: c53b5964f8 am: edabb8e617
am: 9ae080aa9d

Change-Id: I995c1adc61263a0536704fd32bd89efe1a8ec42b
2016-09-15 15:45:03 +00:00
Hugo Benichi
9ae080aa9d Support ignoring penalty for bad wifi networks am: c8e9e1229a am: c53b5964f8
am: edabb8e617

Change-Id: Ib9a60eb528eb62ebf26d5d5a1941bfed0bb21163
2016-09-15 15:36:58 +00:00
Hugo Benichi
edabb8e617 Support ignoring penalty for bad wifi networks am: c8e9e1229a
am: c53b5964f8

Change-Id: Ideee96cc5fc1631cfbc90cd9a59f34a2d5fde160
2016-09-15 15:30:26 +00:00
Hugo Benichi
c53b5964f8 Support ignoring penalty for bad wifi networks
am: c8e9e1229a

Change-Id: I6666ee45e9a08c02444c6268b2232bbe8aa2adec
2016-09-15 15:23:57 +00:00
Lorenzo Colitti
9be58c5580 Support displaying a dialog when wifi becomes unvalidated.
Bug: 31075769
Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134
2016-09-15 23:33:34 +09:00
Nicolas Prévot
0d9518b6f9 Merge "Fix constant errors in ActivityManagerNative." 2016-09-15 12:55:43 +00:00
Julia Reynolds
b5e44b7966 Add Notification channels
In this iteration:
-Every app gets a default channel that notifications will be posted
to if they don't specify a channel themselves. The default channel
inherits app-wide settings on upgrade.
-Apps can create new channels without user approval, but apps
cannot change the name of a channel once created, nor can they ever
set the importance.
- When a notification is posted:
  - If the channel is marked as 'vibrates', vibration will be
    applied to notifications that lack a vibration. unlike the default
    notification flag, notifications will retain their custom vibration
    if given
  - Same with sound and lights
  - A notification's importance is the min of the app and channel
    importance
  - A notification can bypass dnd if: either the app or channel settings
    say it can
  - A notification's show on lockscreen setting comes from the app first,
    and the channel second if the app has no preference

Tests: in cl. also there's a cl for cts and a test app.

Change-Id: I630f99df655800b00586dcfab538d320d04fe0f0
2016-09-15 08:42:35 -04:00
Rubin Xu
3ba5331a83 resolve merge conflicts of 4daa1b7 to master
Change-Id: I5292c074234fccc26c7a843f56eb68edce26d678
2016-09-15 10:42:50 +01:00
Hugo Benichi
c8e9e1229a Support ignoring penalty for bad wifi networks
This patch adds a way to configure devices so that a validated network
that becomes unvalidated is not penalized in the network scoring and
selection logic.

The intent is to prevent devices configured to do so from switching to a
lower scoring network such as cellular networks when a higher scoring
network such as wifi networks loses internet connectivity.

Bug: 31075769
Change-Id: Ie7e0f2607d214a178367fedfbef6c44768fa00a4
2016-09-15 18:34:13 +09:00
Michal Karpinski
4a134a93d2 Merge "Fingerprint Strong auth timeout" 2016-09-15 07:46:07 +00:00
Hongming Jin
afe9a6c768 Only return password for account session flow if the caller is signed with system key and have get_password permission. am: 9342e137c6 am: 8b75ebf0bb
am: adc906206a

Change-Id: I3c9aee82df05e9a74eed960c1d03ea5d9fe477d7
2016-09-14 23:44:52 +00:00
Hongming Jin
adc906206a Only return password for account session flow if the caller is signed with system key and have get_password permission. am: 9342e137c6
am: 8b75ebf0bb

Change-Id: I95794bb5269c849fe740576a344e43da4306ac56
2016-09-14 23:32:29 +00:00
Hongming Jin
914e549bce Only return password for account session flow if the caller is signed with system key and have get_password permission. am: 9342e137c6
am: 57e38003e8

Change-Id: Iaa63cf3bc288803e92a81386f03d1151d78e6b02
2016-09-14 23:32:11 +00:00
Hongming Jin
8b75ebf0bb Only return password for account session flow if the caller is signed with system key and have get_password permission.
am: 9342e137c6

Change-Id: I932c85bdc302899b42342d3efc249a5420da764c
2016-09-14 23:23:05 +00:00
Hongming Jin
57e38003e8 Only return password for account session flow if the caller is signed with system key and have get_password permission.
am: 9342e137c6

Change-Id: I10134040a7596000e768433943979c9af790e582
2016-09-14 23:23:05 +00:00
TreeHugger Robot
43c53a6311 Merge "Leak UsbDeviceConnection fd if not closed" 2016-09-14 22:59:24 +00:00
Philip P. Moltmann
4346f3c5ec Set buffer before UsbRequest is queued
Otherwise a second thread might dequeue() it in between
native_queue_direct and mBuffer = buffer. If that happens the dequeue
operation does mBuffer.isDirect which triggers a NPE.

Fixes: 30914003
Change-Id: I3ca3b72db8f53a14be1c5f0e37f8924eba44b9bc
2016-09-14 22:44:50 +00:00
Kirill Grouchnikov
33d21b1a7a Merge "Mark a hidden MotionEvent method to be visible for tests" 2016-09-14 21:39:14 +00:00