Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
271,596 Commits 3 Branches 0 Tags
51a6ca483f7edbd01dd9155cc35cce483923c31e
Commit Graph

67598 Commits

Author SHA1 Message Date
Etan Cohen
51a6ca483f reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp 
Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1
 2016-09-16 12:40:03 -07:00
Lorenzo Colitti
4e3d827695 Give WakeupMessage the ability to transport an object as well. 
am: 302c37008f

Change-Id: I06152851a392de80b351f2eb332e31363d916b1d
 2016-09-16 18:47:26 +00:00
Etan Cohen
eaf7de888d [NAN] Add transport type for NAN. 
am: 305ea28a43

Change-Id: I9e12a30de06481418fa2c322fbeef0ecde75f746
 2016-09-16 18:45:49 +00:00
Tianjie Xu
4392153753 Merge "Collect status on uncrypt time cost" am: bc19e00d35 am: 79d27bdeac 
am: 1579ce8a1d

Change-Id: I17fe7d518a0bc5876d91373b643dd95779be2c54
 2016-09-16 18:40:45 +00:00
Tianjie Xu
1579ce8a1d Merge "Collect status on uncrypt time cost" am: bc19e00d35 
am: 79d27bdeac

Change-Id: I64f13dbe40845eecb584c0f45a169e0c948275ab
 2016-09-16 18:36:20 +00:00
Tianjie Xu
79d27bdeac Merge "Collect status on uncrypt time cost" 
am: bc19e00d35

Change-Id: I867821b7575ee2e45bb86c46222e6cf34971689d
 2016-09-16 18:30:38 +00:00
Tianjie Xu
bc19e00d35 Merge "Collect status on uncrypt time cost" 2016-09-16 18:19:23 +00:00
Robert Sesek
1201509679 Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58 am: c1b32fc3ea 
am: 5189f86a36

Change-Id: I495848744c205295d18211c977b64f3a437ec27a
 2016-09-16 17:52:50 +00:00
Robert Sesek
5189f86a36 Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58 
am: c1b32fc3ea

Change-Id: Ifae90057835b576ca001a141cb56aa4e4f9ba321
 2016-09-16 17:41:17 +00:00
Robert Sesek
c1b32fc3ea Move art::Runtime::InitZygote logic from art into frameworks/base. 
am: e4f8d69c58

Change-Id: Ia6fdf02ba9d7cd6e473d2891d5b8e59b4e967347
 2016-09-16 17:32:49 +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
Treehugger Robot
9c08f6bb82 Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." 2016-09-16 17:23:42 +00:00
Lorenzo Colitti
302c37008f Give WakeupMessage the ability to transport an object as well. 
(cherry-pick of commit eab17da588)
(cherry-pick of commit 4171cdf303)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
 2016-09-16 10:22:06 -07:00
Etan Cohen
305ea28a43 [NAN] Add transport type for NAN. 
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7b84987a6a)
(cherry-pick of commit bd9fdbe022)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
 2016-09-16 10:21:51 -07: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
Michael Kwan
e455850fbd Limit translation of bottom panel snapping to not overshoot. 
am: b1440bdb17

Change-Id: I5e34ac21774e9c781f3f3aef0b0a37fe81e1f747
 2016-09-15 22:27:52 +00:00
TreeHugger Robot
81b4314540 Merge "Limit translation of bottom panel snapping to not overshoot." into cw-f-dev 2016-09-15 22:23:19 +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
Patrick Baumann
564d936eb1 Adding advanced pattern support to PatternMatcher 
am: 2baf095ca9

Change-Id: Id4e05a79797af961e6505715b69da4319f2042cc
 2016-09-15 21:28:27 +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
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
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
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
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
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
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
Hongming Jin
9342e137c6 Only return password for account session flow if the caller is signed 
with system key and have get_password permission.

Bug: 30455516
Change-Id: I78484c59e4de1dff685ab91a0a8e7a756fffd9bf
 2016-09-14 14:15:56 -07:00
Robert Sesek
e4f8d69c58 Move art::Runtime::InitZygote logic from art into frameworks/base. 
Test: m
Test: aosp_angler-eng boots
Change-Id: I964c70576136e7424797140b2f7d179e70298c44
 2016-09-14 14:31:12 -04:00
Rubin Xu
4daa1b7df4 Allow direct-boot aware activity to show before profile is unlocked am: 89927b3cd9 
am: df5e18245f

Change-Id: I38cb058bf7cf58c0553a2addfc68517244c87df7
 2016-09-14 17:53:40 +00:00
Rubin Xu
df5e18245f Allow direct-boot aware activity to show before profile is unlocked 
am: 89927b3cd9

Change-Id: Ia4fd5feb1e2b5efbe52fde21ec871cf4f679330e
 2016-09-14 17:30:09 +00:00
Rubin Xu
89927b3cd9 Allow direct-boot aware activity to show before profile is unlocked 
Work profile challenge is shown by intercepting normal activity launching and
replacing it with the confirm credential activity. For direct boot aware
activities, they should be able to be displayed when the work profile is
still locked, so add a conditional in the activity intercepting logic to bypass
work challenge in this case.

Also launching work profile activities from notification is handled specially
in order to avoid dismissing the notification if the work challenge is canceled,
so add similar logic there to allow direct boot aware activity to go through.

Bug: 30296144
Change-Id: Ib6395271cee2d4781009bb08d50351d73824de0c
 2016-09-14 11:59:56 +01:00
Phil Weaver
f5b9956bdb Strengthen language about use of a11y API. am: 752047dd3d 
am: 8f27aabc12

Change-Id: I6c5195bf391bdc3dd374c818b4303ecc4c0bf016
 2016-09-13 22:29:29 +00:00
Phil Weaver
8f27aabc12 Strengthen language about use of a11y API. 
am: 752047dd3d

Change-Id: I30567206c699d7fd1fc537a3ec0d635fab73799d
 2016-09-13 22:25:43 +00:00
Phil Weaver
82f050f736 Merge "Strengthen language about use of a11y API." into nyc-mr1-dev 2016-09-13 22:17:03 +00:00
liulvping
9eadea585c Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6 am: 506bf0741a 
am: 5f4f8d2441

Change-Id: Iedcf57ee7856fb9abac459230e686a351370543d
 2016-09-13 21:15:51 +00:00
liulvping
5f4f8d2441 Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6 
am: 506bf0741a

Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e
 2016-09-13 21:10:22 +00:00
liulvping
506bf0741a Merge "fix NullPointerException in RegisteredServicesCache" 
am: 4b1a8f46d6

Change-Id: I1ba9512647d515aedbaf09eb2d7ac524477e5296
 2016-09-13 21:04:55 +00:00
Treehugger Robot
4b1a8f46d6 Merge "fix NullPointerException in RegisteredServicesCache" 2016-09-13 20:57:11 +00:00