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

169596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
10c40fc01d am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit 'a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 05:27:00 +00:00
Craig Mautner
62404e15f9 am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '6151b118b663b0620fee4fb87d9d143c6fd050b8':
  Fix pointer index out of range exception
 2014-12-01 05:26:53 +00:00
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
5a6c196259 am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-01 05:26:37 +00:00
Craig Mautner
0124980e9f resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp 
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
 2014-11-30 21:16:39 -08:00
Craig Mautner
a12ac54cf6 am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit '255963742982daf46eb665a2934bd61e7ed95c81':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 00:22:10 +00:00
Craig Mautner
6151b118b6 am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '94ac906b103b0f03eca2000815bf306209f33109':
  Fix pointer index out of range exception
 2014-12-01 00:16:57 +00:00
Craig Mautner
fac5568214 am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 00:16:52 +00:00
Craig Mautner
2559637429 Merge "[ActivityManager] Prevent provider from been created twice." 2014-12-01 00:16:41 +00:00
Craig Mautner
94ac906b10 Merge "Fix pointer index out of range exception" 2014-12-01 00:13:28 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Craig Mautner
11c67c92de am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '7db48ed03623834f7b8b420c83ab7916f6b39a8a':
  Reset killedByAm flag at attachApplicationLocked
 2014-11-30 23:59:46 +00:00
Craig Mautner
082c0540e9 am 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly" 
* commit '728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
  Prevent showing immersive confirmation unexpectedly
 2014-11-30 23:59:40 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Craig Mautner
728e6c6c17 Merge "Prevent showing immersive confirmation unexpectedly" 2014-11-30 23:54:43 +00:00
Elliott Hughes
29e1c36d4b am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '3afb9f6378779e6ee355b0b56c47ad7270e2b832':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:11:58 +00:00
Elliott Hughes
3afb9f6378 am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '2c53d22bcc00838125cd70e17915da6ded5d0aca':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:07:00 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
 2014-11-27 18:03:15 +00:00
Elliott Hughes
2c53d22bcc Merge "Mention ProGuard in the JNI documentation." 2014-11-27 18:01:34 +00:00
Narayan Kamath
ed2c9c6029 am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
  Stop using ErrorStrings for apache.
 2014-11-27 17:58:21 +00:00
Narayan Kamath
10a36fb749 Merge "Stop using ErrorStrings for apache." 2014-11-27 17:53:04 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache. 
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
 2014-11-27 17:23:41 +00:00
Narayan Kamath
d534645bab am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit 'bedb13782a6beb5f15621915a7b68439c6649ced':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:10:03 +00:00
Narayan Kamath
bedb13782a am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit '8036d2ec739636c1913a417cace97a5027d0270d':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:03:57 +00:00
Narayan Kamath
8036d2ec73 Merge "Delete general sounding "CharArrayBuffers" class." 2014-11-27 13:57:27 +00:00
Narayan Kamath
5445d3de90 am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http." 
* commit 'f0c22b0c72c8fbd5ce507419adda0670871a07bf':
  Delete unused class from android.net.http.
 2014-11-27 13:55:02 +00:00
Olawale Ogunwale
21aadfcf71 am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit 'f586072861850ade660e11eafa799f96314ce475':
  Fix bad exclude region in landscape
 2014-11-27 13:54:37 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class. 
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
 2014-11-27 13:52:11 +00:00
Narayan Kamath
f0c22b0c72 am 14e28134: Merge "Delete unused class from android.net.http." 
* commit '14e28134c445435d71ed754e6be5867655d1dda3':
  Delete unused class from android.net.http.
 2014-11-27 13:03:34 +00:00
Narayan Kamath
14e28134c4 Merge "Delete unused class from android.net.http." 2014-11-27 12:58:33 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http. 
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
 2014-11-27 12:52:48 +00:00
Craig Mautner
205dc8f94c am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '980ce4bad08f65e559c39e86e799389c6615297e':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-27 12:01:33 +00:00
Jeff Sharkey
1446c6c6f6 am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit 'd76737a7325bdcd5010f26fd1626628f07070bb9':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-27 12:01:18 +00:00
Ignacio Solla
a051540e31 am 59565277: (-s ours) am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK." 
* commit '59565277d9fc1d0f21d55a528b2a6e395f051e5d':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-27 12:01:12 +00:00
riddle_hsu
105add8d1a [ActivityManager] Prevent provider from been created twice. 
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.


Solution:
Don't schedule install provider if the provider record
already exist and will be published later.

Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
 2014-11-27 05:16:17 +00:00
Eino-Ville Talvala
3eb27d253b am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit 'ec26692d1f65cf04963d8412e3e3bdd0d42796ea':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:33:09 +00:00
tingna_sung
4f65ca0f76 Fix pointer index out of range exception 
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-11-27 08:32:14 +08:00
Eino-Ville Talvala
ec26692d1f am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit '9b35b801fb90e31c1dff5535715e505f3a1e26fb':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:27:36 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00
Eric Laurent
41b2381db7 am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '981951e4f9bae85dcf6f717023596c08dc245ee7':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-27 00:01:23 +00:00
Eric Laurent
981951e4f9 am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '563e61f5d06aca653894cecc2977bac70b08227c':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-26 23:56:43 +00:00
Jeff Davidson
f01fac9965 am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit 'c452bac6fc100bf30d4ddde5b4e008dd862750e5':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:52:56 +00:00
Eric Laurent
563e61f5d0 Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 2014-11-26 23:52:08 +00:00
Jeff Davidson
c452bac6fc am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit '3caf0f8e440fcc9947b8b153464ccdbc62640c97':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:46:44 +00:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
Olawale Ogunwale
f586072861 am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit '87c5f3621037eda3c4d141e5681d4acbbaa13944':
  Fix bad exclude region in landscape
 2014-11-26 23:20:30 +00:00
Olawale Ogunwale
87c5f36210 Merge "Fix bad exclude region in landscape" 2014-11-26 23:13:59 +00:00
Kazuki Nakayama
609cb91c9c Reset killedByAm flag at attachApplicationLocked 
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
 2014-11-26 15:07:33 -08:00
Eino-Ville Talvala
4c9c7a5883 CameraManager: Separate service listener into a singleton 
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
 2014-11-26 13:58:15 -08:00