drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,607 Commits 1 Branch 0 Tags
Commit Graph

175607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f651225d58 am 205dc8f9: am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '205dc8f94cfd469c2a845d9fb010efba7f9aaba9':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-27 12:08:26 +00:00
Jeff Sharkey
a6f1257a33 am 1446c6c6: am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit '1446c6c6f67d285bd47b878de6326b8e82fafb2b':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-27 12:08:18 +00:00
Ignacio Solla
da10fb3608 am a051540e: am 59565277: (-s ours) am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK." 
* commit 'a051540e31781021726d8c8fbf5db2c6604d4fcb':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-27 12:08:14 +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
223661ec98 am 3eb27d25: am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit '3eb27d253b609fdce8b6e0e9aa4662631d52a0ce':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:38: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
539d57aaf0 am 41b2381d: am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '41b2381db7225f7ff11c523662de6cfb47fc7c85':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-27 00:08:51 +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
Jeff Davidson
b3ae00d85c am f01fac99: am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit 'f01fac9965f0fd987655fa0a09a29e67503725e2':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-27 00:00:12 +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
Mathieu Meisser
ad66d7d2c1 Add keylayout for Logitech RedHawk Gamepad 
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
 2014-11-27 00:46:01 +01: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
Craig Mautner
980ce4bad0 am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-26 21:47:35 +00:00
Jinsuk Kim
b62d4ee785 am f657463a: am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 
* commit 'f657463a500e90acb2fa9991cd67629199ef7ab4':
  Do not perform forceVolumeControlStream in master volume mode
 2014-11-26 21:45:22 +00:00
Craig Mautner
200496b571 Merge "ANR caused by incorrect cleanup in BroadcastQueue." 2014-11-26 21:43:59 +00:00
Jinsuk Kim
f657463a50 am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 
* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode
 2014-11-26 21:39:08 +00:00
Jinsuk Kim
c69c8dc159 am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 
* commit 'bc3226e21dfe881bf1ccae62e10b660d97b2b232':
  Do not perform forceVolumeControlStream in master volume mode
 2014-11-26 21:33:23 +00:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Guobin Zhang
04d0bb6e93 ANR caused by incorrect cleanup in BroadcastQueue. 
Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
 2014-11-26 13:23:30 -08:00
Chris Craik
62bdf2c863 am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 21:08:00 +00:00
Chris Craik
e986817a2d am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit '6eac26a49957eda233ad22ad75da43379f220bbc':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 21:02:24 +00:00
Chris Craik
6eac26a499 am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit 'ca84c8b1b0e364e01ce392f0dbca5132830a148d':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 20:57:35 +00:00
Chris Craik
ca84c8b1b0 Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 2014-11-26 20:50:10 +00:00
Geoff Mendal
ddf7e2dfc2 Merge "Import translations. DO NOT MERGE" 2014-11-26 20:16:57 +00:00
Geoff Mendal
72444415e7 Import translations. DO NOT MERGE 
Change-Id: I04f0013a9da5c41d7fc0140586516d4183ac470e
Auto-generated-cl: translation import
 2014-11-26 12:13:37 -08:00
Lajos Molnar
1188804d65 am 0eaee607: am 9bde6e41: am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 
* commit '0eaee607b8799bc6635efc8e65df13b6411b5a84':
  Fix broken @see javadoc in android.media.* classes
 2014-11-26 20:06:49 +00:00
vandwalle
a7af2e8fb6 am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 
* commit 'f12fc2e14ebcf14745de03963a621e36bda11232':
  make startScan with worksource specific to location scans
 2014-11-26 20:06:44 +00:00
Jeff Sharkey
bc2f7146e6 am 06e8c58e: am cd5d46ff: am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev 
* commit '06e8c58e7cf84b87613f4c8114ec75db58e32d72':
  package_info GID shouldn't have write.
 2014-11-26 20:06:39 +00:00
Lajos Molnar
0eaee607b8 am 9bde6e41: am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 
* commit '9bde6e419e2521e67975c8ab84c12cbf6d983f66':
  Fix broken @see javadoc in android.media.* classes
 2014-11-26 20:02:41 +00:00
vandwalle
f12fc2e14e am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 
* commit 'b6c9cbc57694fb7fbd903fa08d42a55bc729114d':
  make startScan with worksource specific to location scans
 2014-11-26 20:02:35 +00:00
Jeff Sharkey
06e8c58e7c am cd5d46ff: am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev 
* commit 'cd5d46ff81ab652dc9dc9c28d607f536187f3bab':
  package_info GID shouldn't have write.
 2014-11-26 20:02:29 +00:00