kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-02-10 09:12:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert D2779079

Browse Source 
Reviewed By: zjj010104

Differential Revision: D2802728

fb-gh-sync-id: 9e09f00d1d7facd2091fe60eee8565c4bf599b1d
This commit is contained in:
Fada Chen
2016-01-05 00:40:54 -08:00
committed by facebook-github-bot-7
parent 18cdead76b
commit ee82bad3f7
5 changed files with 1 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java
View File

@@ -17,7 +17,6 @@ import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
@@ -47,7 +46,6 @@ import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.bridge.queue.CatalystQueueConfigurationSpec;
import com.facebook.react.common.ApplicationHolder;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.annotations.VisibleForTesting;
import com.facebook.react.devsupport.DevServerHelper;
@@ -204,9 +202,6 @@ import com.facebook.systrace.Systrace;
NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
initializeSoLoaderIfNecessary(applicationContext);
// TODO(9577825): remove this
ApplicationHolder.setApplication((Application) applicationContext.getApplicationContext());
mApplicationContext = applicationContext;
mJSBundleFile = jsBundleFile;
mJSMainModuleName = jsMainModuleName;

36
ReactAndroid/src/main/java/com/facebook/react/common/ApplicationHolder.java
View File

@@ -1,36 +0,0 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
package com.facebook.react.common;
import android.app.Application;
import com.facebook.infer.annotation.Assertions;
import com.facebook.proguard.annotations.DoNotStrip;
/**
* Holds the current Application Object.
*
* TODO(9577825): This is a bad pattern, we should thread through an Environment object instead.
* Remove once bridge is unforked.
*/
@DoNotStrip
@Deprecated
public class ApplicationHolder {
private static Application sApplication;
public static void setApplication(Application application) {
sApplication = application;
}
public static Application getApplication() {
return Assertions.assertNotNull(sApplication);
}
}