Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
286,268 Commits 3 Branches 0 Tags
7c2e30c48fa02097d5c3eda3c8d94b61508e7c0c
Commit Graph

70133 Commits

Author SHA1 Message Date
Android Build Merger (Role)
7c2e30c48f Merge "Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7 am: f7caea844f" 2016-09-17 00:46:38 +00:00
Jeff Sharkey
b72e835129 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7 
am: f7caea844f

Change-Id: Ifa9167a9a69240712a59b90839a32605cfdd7037
 2016-09-17 00:46:04 +00:00
TreeHugger Robot
828882a2da Merge "Configuration renaming and minor cleanup in AM and WM" 2016-09-17 00:44:04 +00:00
Jeff Sharkey
f7caea844f Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 
am: bd5d0049d7

Change-Id: Ia9f491892b3b26938dd11f3ed8fc63cc81d37490
 2016-09-17 00:35:38 +00:00
Jeff Sharkey
bd5d0049d7 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 
am: db901ee296

Change-Id: I9033fb021c68bbfc4a8d706e1e7c059f294f510c
 2016-09-17 00:24:10 +00:00
Jeff Sharkey
db901ee296 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff 
am: 33ada2e927

Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a
 2016-09-17 00:13:26 +00:00
Jeff Sharkey
33ada2e927 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
 2016-09-16 23:40:13 +00:00
Jeff Sharkey
fc1c0f9dff Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 
am: afcd1135c3

Change-Id: I9cbfddb282796b2425a0da76760bde0ebd8336b4
 2016-09-16 23:31:45 +00:00
Jeff Sharkey
afcd1135c3 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 
am: df42d732f8

Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
 2016-09-16 23:14:51 +00:00
Jeff Sharkey
df42d732f8 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
 2016-09-16 16:57:55 -06:00
Andrii Kulian
8072d11f6a Configuration renaming and minor cleanup in AM and WM 
- Configuration members in AM and WM are renamed to
  mGlobalConfiguration.
- Renamed parameters names in some methods to better represent
  their meaning.
- Added and fixed some docs.

Change-Id: Ie51f687fe4c10dbce776435f29d6b853fda50eec
 2016-09-16 15:40:30 -07:00
Jeff Sharkey
0a9d537f62 Use "all_downloads" instead of "my_downloads". am: 1547194418 am: f6d7c1ed15 
am: 6db572cf00

Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
 2016-09-16 22:07:27 +00:00
Jeff Sharkey
6db572cf00 Use "all_downloads" instead of "my_downloads". am: 1547194418 
am: f6d7c1ed15

Change-Id: Icb352ec7b0e746264a6311b5fba1fc1272b627b0
 2016-09-16 21:53:37 +00:00
Jeff Sharkey
f6d7c1ed15 Use "all_downloads" instead of "my_downloads". 
am: 1547194418

Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
 2016-09-16 21:48:24 +00:00
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
Tianjie Xu
cd15fdfb4f Merge "Collect status on uncrypt time cost" am: bc19e00d35 am: 79d27bdeac am: 1579ce8a1d 
am: 4392153753

Change-Id: Ic7ff4b820255d1cd305909ad6b920f9e0a1b5ac9
 2016-09-16 18:52:28 +00: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
Jeff Sharkey
1547194418 Use "all_downloads" instead of "my_downloads". 
We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied.  Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.

Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.

Bug: 30537115, 30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
 2016-09-16 12:04:05 -06:00
Robert Sesek
1690bd65ed Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58 am: c1b32fc3ea am: 5189f86a36 
am: 1201509679

Change-Id: I7ffedde18d0f5b4ac2b7d38dc2379ad18c17dfca
 2016-09-16 18:02:27 +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
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
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
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
Michael Kwan
591d1a1be8 Limit translation of bottom panel snapping to not overshoot. am: b1440bdb17 
am: e455850fbd

Change-Id: Id1eca37ba57903b7794c5cb5c3054d18fc62c266
 2016-09-15 22:34:21 +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
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