Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roshan Pius
821cc37981 Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9 
am: afef95d3c5

Change-Id: I596db3965d8b99ff303bc1d21c9b19c87aea4bec
 2016-09-16 22:58:49 +00:00
Jeff Sharkey
df42d732f8 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
 2016-09-16 16:57:55 -06:00
TreeHugger Robot
5195e8288d Merge "docs: Clarification for location permissions and location hardware" into nyc-dev 2016-09-16 22:52:41 +00:00
Roshan Pius
afef95d3c5 Merge "WifiScanner: Change hidden/PNO scan params" 
am: b1161c83f9

Change-Id: I2d517f18f1cd9e412467785316c8b67e1a1a400d
 2016-09-16 22:44:49 +00:00
Roshan Pius
b1161c83f9 Merge "WifiScanner: Change hidden/PNO scan params" 2016-09-16 22:34:57 +00:00
Hemal Patel
247d1c9ea8 Fixed a typo in the code sample 
Bug: 6062536
Change-Id: I1f6a91534cf18b9fba4e00f3a4b84983f2c223a3
 2016-09-16 15:28:42 -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
Kylie Jue
4ef9c71ad9 Merge "docs: Added v7 Palette library documentation and images to DAC training. https://android-dot-devsite.googleplex.com/training/material/palette-colors.html" into nyc-dev 
am: eae7f0b513

Change-Id: I375f5ad43be11674d95d41ee0c1a520c36adce83
 2016-09-16 22:05:13 +00:00
Kylie Jue
c5baab8c98 docs: Added v7 Palette library documentation and images to DAC training. https://android-dot-devsite.googleplex.com/training/material/palette-colors.html 
am: 70db4fab5c

Change-Id: Ic4992ad5e8379cdbfe39a67bd296ce3bedf58e4e
 2016-09-16 22:05:08 +00:00
Tadashi G. Takaoka
a0b92c88ed Catch all exceptions when parsing IME meta data 
am: dddc438e97

Change-Id: I9cf7bfa63632508fba473b3ae0066579a0dde31a
 2016-09-16 21:58:18 +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
Kylie Jue
eae7f0b513 Merge "docs: Added v7 Palette library documentation and images to DAC training. https://android-dot-devsite.googleplex.com/training/material/palette-colors.html" into nyc-dev 2016-09-16 21:51:18 +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
Joe Fernandez
1294dde183 docs: Clarification for location permissions and location hardware 
b/28052540

Change-Id: I54fa08a3339c1d373164a003a02adeed156fa331
 2016-09-16 14:35:05 -07:00
Colin Cross
281386df64 aapt: remove duplicate definition of ZD 
ZD and ZD_TYPE are set by utils/Compat.h, remove them from
StringPool.cpp and Resource.cpp.

Test: m -j native
Bug: 31492149
Change-Id: I6154e4598dd1f279e348ef6c0b32d756464bda8a
 2016-09-16 12:56:21 -07:00
Etan Cohen
9b5350644a Merge changes from topic 'undo_do_not_merge' into stage-aosp-master 
am: e77c8c6486

Change-Id: I558e60beb55943a31bc29279a09f24b1963ffd10
 2016-09-16 18:47:38 +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
Etan Cohen
e77c8c6486 Merge changes from topic 'undo_do_not_merge' into stage-aosp-master 
* changes:
  Give WakeupMessage the ability to transport an object as well.
  [NAN] Add transport type for NAN.
 2016-09-16 18:41:36 +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
Mark Lu
7aafc81c2e Merge "[AM] Skip unnessary ANR when process already died." am: 831a4aea1e 
am: 57341808f1

Change-Id: I95e71746ddf33247da1b81c9036b3f46d89f446e
 2016-09-16 18:30:41 +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
Mark Lu
57341808f1 Merge "[AM] Skip unnessary ANR when process already died." 
am: 831a4aea1e

Change-Id: Ib8c0ffa8d50bb5a3fbc2d8f35274a8301494cd93
 2016-09-16 18:26:10 +00:00
Tianjie Xu
bc19e00d35 Merge "Collect status on uncrypt time cost" 2016-09-16 18:19:23 +00:00
Treehugger Robot
831a4aea1e Merge "[AM] Skip unnessary ANR when process already died." 2016-09-16 18:16: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
a139f6bb27 Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: 9c08f6bb82 
am: 9c24e04b9e

Change-Id: I0437c65d085069d0df33bdda48d08359cc482559
 2016-09-16 17:44:33 +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
9c24e04b9e Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." 
am: 9c08f6bb82

Change-Id: Ia58d4bb105e564437216b9e951b83e721f47c51d
 2016-09-16 17:37:43 +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
Treehugger Robot
9c08f6bb82 Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." 2016-09-16 17:23:42 +00:00
Kylie Jue
70db4fab5c docs: Added v7 Palette library documentation and images to DAC training. 
https://android-dot-devsite.googleplex.com/training/material/palette-colors.html

Bug: 30034142

Change-Id: I1e82b82a84def6ef72e0401418085694d5bbeee2
 2016-09-16 10:22:40 -07: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
Mark Lu
41d65f28c2 [AM] Skip unnessary ANR when process already died. 
When app process been killed by AMS or lowmemkiller just before ANR report,
because process record info has been cleared after received death recipient,
it also cannot dump trace log because process already dead,
so report ANR & show ANR UI to let user wait seems is unnecessary.
(compare normal ANR case, if kill app process by command,
ANR dialog will also dismissed, it seems reasonable.)

To check above condition, if ANR process record killed set as true,
it means process already dead & can skip report this ANR.

Change-Id: I483cb02bacb10c32db80ca1097310b02abbac24d
 2016-09-17 00:28:20 +08:00
Elliott Hughes
924288c24d Merge "Stop including libcore/include/ in most of frameworks/base." am: 05884ac869 
am: 21ba3d9527

Change-Id: I6d71b74ffb28cf564a9f21a9dd5d749f76d83210
 2016-09-16 08:50:08 +00:00
Elliott Hughes
21ba3d9527 Merge "Stop including libcore/include/ in most of frameworks/base." 
am: 05884ac869

Change-Id: I4f919dc0bfcb4d9ecd65c61b304c01169ba3ce8a
 2016-09-16 08:43:56 +00:00
Treehugger Robot
05884ac869 Merge "Stop including libcore/include/ in most of frameworks/base." 2016-09-16 08:36:44 +00:00
Tadashi G. Takaoka
7bb4c82558 DO NOT MERGE: Catch all exceptions when parsing IME meta data 
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065)
 2016-09-16 06:03:42 +00:00
Tadashi G. Takaoka
43f4980e77 DO NOT MERGE: Catch all exceptions when parsing IME meta data 
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065)
 2016-09-16 06:02:18 +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
Treehugger Robot
85539bed77 Merge "Remove synchronization from getCurrentInputMethodSubtype()" 2016-09-16 05:21:33 +00:00
Tadashi G. Takaoka
c6fc6c3b55 DO NOT MERGE: Catch all exceptions when parsing IME meta data 
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065)
 2016-09-16 13:57:05 +09:00
Tadashi G. Takaoka
f71d2cddf1 DO NOT MERGE: Catch all exceptions when parsing IME meta data 
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065)
 2016-09-16 13:51:43 +09:00
Tadashi G. Takaoka
dddc438e97 Catch all exceptions when parsing IME meta data 
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
 2016-09-16 04:40:34 +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
Sudheer Shanka
dce4be63bb DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I1fddd06f5e35b67fea041741f5746c57a39208ba
 2016-09-15 19:00:43 -07:00
Sudheer Shanka
b59e73613b DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
 2016-09-15 18:01:44 -07:00
Sudheer Shanka
e8340a9ed5 DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
 2016-09-15 18:00:51 -07:00