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
Sudheer Shanka
2d608378f4 DO NOT MERGE: Fix deadlock in AcitivityManagerService. 
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
 2016-09-15 17:59:52 -07:00
Jordan Liu
2c865489f2 Remove dial_string_replace configs 
Remove old configs within frameworks/base. With move to CarrierConfig no
need for the old resources.
Merged-In: I0b0e5dda79e129fb1b525af9ef69c00a97f26ee9

Bug: 29873049
Change-Id: I0b0e5dda79e129fb1b525af9ef69c00a97f26ee9
 2016-09-15 16:11:11 -07:00
Elliott Hughes
f0c606eb3e Stop including libcore/include/ in most of frameworks/base. 
frameworks/base/core/jni/android_text_StaticLayout.cpp does actually use
ScopedIcuLocale, so I've left that for now.

Change-Id: I6458cd133871281a747a9da2e304da10b445051a
 2016-09-15 13:13:39 -07:00
Dan Yu
5f3beacdb1 Merge "docs: Add docs on OnboardingFragment" into nyc-dev 
am: f3f6921b57

Change-Id: I5b327e628f8e4aede45b274416879177b8cb0cd7
 2016-09-15 16:22:15 +00:00
Daniel Yu
1fff868293 docs: Add docs on OnboardingFragment 
am: d64f8bfe1f

Change-Id: I35c76cc90613cee8ca23c1ea520fee2a27f59583
 2016-09-15 16:22:11 +00:00
Dan Yu
f3f6921b57 Merge "docs: Add docs on OnboardingFragment" into nyc-dev 2016-09-15 16:13:22 +00:00
Scott Main
577de947ca Merge "Revert "add dev guide for constraint layout."" into nyc-dev 
am: a688419378

Change-Id: I354587408dd304dd6a709420643cc48afd351a7a
 2016-09-15 03:43:39 +00:00
Scott Main
e967d6f43b Revert "add dev guide for constraint layout." 
am: e6469e8211

Change-Id: I687e80b30301be15997cf1d2639cf3e7a135fb62
 2016-09-15 03:43:34 +00:00
Scott Main
a688419378 Merge "Revert "add dev guide for constraint layout."" into nyc-dev 2016-09-15 03:38:42 +00:00
Scott Main
e6469e8211 Revert "add dev guide for constraint layout." 
studio 2.2 launch delayed

This reverts commit 346f6d395c.

Change-Id: I61a555ed3f804dfdc4ef3e9a84e869154206639d
 2016-09-15 03:37:37 +00:00
Hongming Jin
482d817b5a Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev 
am: 0c04977949

Change-Id: I97506d9c1304b844d9ec6c375aa3594a25c255fc
 2016-09-14 23:23:10 +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
0c04977949 Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev 2016-09-14 23:10:40 +00:00
Scott Main
e0d523428f Merge "add dev guide for constraint layout." into nyc-dev 
am: 03ed8f30cb

Change-Id: I2c3ba7b03ab8a74476aa4efd016e42d83f266dff
 2016-09-14 21:44:35 +00:00
smain@google.com
86c7bda51d add dev guide for constraint layout. 
am: 346f6d395c

Change-Id: Icfa7b31c610e08dd3c3bdf106a35d84e74e3d689
 2016-09-14 21:44:22 +00:00
Eric Schmidt
8350cbf824 docs: Fixed language directory issue localization 
Bug: 31096141
Change-Id: I571669b752e89f252c80f87ba04a70a81b5f94fd
 2016-09-14 14:42:22 -07:00
Sudheer Shanka
67e05b4d28 Fix deadlock in AcitivityManagerService. 
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
 2016-09-14 14:37:14 -07:00
Scott Main
03ed8f30cb Merge "add dev guide for constraint layout." into nyc-dev 2016-09-14 21:33:11 +00:00
Jordan Liu
12bc4ea71e Add key to CarrierConfig 
Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.

This value exists because:
http://b/10131736, requires radio restart.
http://b/16308209, http://b/17567651 require that we do not restart.

Merged-In: I4e199d7fe73b82fa39475f31825e5b8ae58d180f

Bug: 29873049
Change-Id: Ie9f8665ff40e2082cf92aa8b4dc337c5ea2ea974
 2016-09-14 14:30:31 -07: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
Eric Schmidt
718b31c9d9 docs: Fixed language directory issue. am: e9d0adb735 -s ours 
am: 192688f756

Change-Id: Ic713119028bb748befe17c5f5b6f93ce8ceb23dc
 2016-09-14 21:07:41 +00:00
Eric Schmidt
192688f756 docs: Fixed language directory issue. 
am: e9d0adb735  -s ours

Change-Id: Icdffa01fe8ee2a9683cee436a2822a243d915c12
 2016-09-14 20:58:45 +00:00
Ajay Panicker
85bc33a8f4 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed 
Bug: 28672558
Change-Id: I4bc14bd7f098e34012c2ae1eeba2d439145901f0
 2016-09-14 19:17:49 +00:00
Eric Schmidt
e9d0adb735 docs: Fixed language directory issue. 
Bug: 31096141
Change-Id: Ibc6789f0381b25ec1449e2b180f20c96cb38a0e3
 2016-09-14 12:03:51 -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
Roshan Pius
8da6bdc2d3 WifiScanner: Change hidden/PNO scan params 
Since networks are no longer configured in wpa_supplicant, network
IDs/priorities being passed around for hidden/PNO scanning does not
make any sense.
Changing the wifi scanner interface to remove all network ID/priority
references. These will be replaced by SSID of the corresponding
networks for hidden networks.

BUG: 29503772
TEST: Existing unit tests.
TEST: Successfully connected to a hidden network on device
Change-Id: I5d877e0345d574fb513b6eecca14f65f2ee4e7ab
 2016-09-14 09:15:41 -07:00
Tobias Lindskog
f61a27c096 Merge "Skip ANR for processes that have been killed" am: 9d9cf5b383 
am: b35b5f2bd1

Change-Id: Iee85d717feac0d7652993d90d4157052dc4292c1
 2016-09-14 14:06:30 +00:00
Tobias Lindskog
b35b5f2bd1 Merge "Skip ANR for processes that have been killed" 
am: 9d9cf5b383

Change-Id: I4c88713b7b174908faa6f8703257c40cabd59ae7
 2016-09-14 14:00:54 +00:00
Treehugger Robot
9d9cf5b383 Merge "Skip ANR for processes that have been killed" 2016-09-14 13:54:37 +00:00
Narayan Kamath
c9f86e1256 Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." am: 796578f9a9 
am: 2b283bd24f

Change-Id: I29fe2dbc5fb012248622d39afd459570714d246f
 2016-09-14 13:21:22 +00:00
Narayan Kamath
2b283bd24f Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." 
am: 796578f9a9

Change-Id: I74c142183c3632f725b6992388235ad8e59bc389
 2016-09-14 13:15:51 +00:00
Treehugger Robot
796578f9a9 Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." 2016-09-14 13:07:05 +00:00
Narayan Kamath
5638991c82 app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal. 
Don't make allowances for older kernels. Kernels must handle this
properly since it is now a CTS requirement.

Also remove some unreachable return statements.

Change-Id: I280c4ed5e461d37672236747b5dbb7d1e97ecfec
 2016-09-14 10:24:20 +01:00
Kevin Hufnagle
3b63a38d36 docs: Updated Android logo on "Brand Guidelines" page 
Bug: 25457428
Change-Id: Iae7e39de54e797d9c6e91db36c1f9011f143857e
 2016-09-13 19:06:20 -07:00
Dirk Dougherty
7d47b55cc0 Add build target for generating navtree json with all inherited members. 
Change-Id: I142e848b5288d92e14445025705ea7596e635b6b
 2016-09-13 16:44:25 -07:00
liulvping
5f4f8d2441 Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6 
am: 506bf0741a

Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e
 2016-09-13 21:10:22 +00:00
Ajay Panicker
786e2694b1 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed 
Bug: 28672558
Change-Id: I4bc14bd7f098e34012c2ae1eeba2d439145901f0
 2016-09-13 21:09:44 +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
John Reck
5a8af8f252 Ensure munmap matches mmap am: aa394dd42c am: 068403a842 am: d073e28853 am: c9cf811b50 
am: b74a6f60d1

Change-Id: If84d98a79ad8d0857f8a777e160ed6d35e07f8ae
 2016-09-13 20:46:52 +00:00
John Reck
b74a6f60d1 Ensure munmap matches mmap am: aa394dd42c am: 068403a842 am: d073e28853 
am: c9cf811b50

Change-Id: I83e3e2d4279c8075283fb0f54521ef015ef9c596
 2016-09-13 20:35:19 +00:00
John Reck
c9cf811b50 Ensure munmap matches mmap am: aa394dd42c am: 068403a842 
am: d073e28853

Change-Id: I2acfdb7c623470b678b59228dfdc3aafaf2b3179
 2016-09-13 20:28:18 +00:00
Bert McMeen
1c3bccceb2 Docs: Preview 3 - Update to bridging of notifications 
Bug: 31181082
Change-Id: Id7c77de123b709e218f62ead30a3429d5ec31430
 2016-09-13 13:26:07 -07:00
John Reck
d073e28853 Ensure munmap matches mmap am: aa394dd42c 
am: 068403a842

Change-Id: I527102b95f239c307cdea2a8bb6dcc6d032e21be
 2016-09-13 20:21:50 +00:00
John Reck
068403a842 Ensure munmap matches mmap 
am: aa394dd42c

Change-Id: I80dbf9a859693cbd90aa472b04ae58d4d081d735
 2016-09-13 20:13:27 +00:00
Cuihtlauac ALVARADO
0b3b2a5f3b Fix parameter description 
Correct parameter description text according to method name.

Change-Id: If6bd8254386a84efd338b58797c2c338ccb513b7
 2016-09-13 14:49:41 +02:00
Joe Fernandez
f2c916f607 Merge "docs: September 2016 Dashboard update" into nyc-dev 
am: 691e49b47c

Change-Id: I8fc558cbbf2d344254f24ef82263be7addb3c0f5
 2016-09-13 05:58:17 +00:00
Joe Fernandez
daae5a89fa docs: September 2016 Dashboard update 
am: 639fd11067

Change-Id: I6f434216f646b6c449be81a15bc76d23f090bf40
 2016-09-13 05:58:06 +00:00
Kevin Hufnagle
5f2ab48cf1 Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev 
am: 5251c874cc

Change-Id: I3f0c65b51d92eaee876c4bd752f99e7425c0d0b5
 2016-09-13 05:57:51 +00:00
Kevin Hufnagle
2e164835d5 docs: Added note about permission/feature changes with network/GPS. 
am: 0090727d95

Change-Id: Ica711ea6e5956d14fc39dcf3add3423c227eabc4
 2016-09-13 05:57:40 +00:00