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

169560 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
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
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
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
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
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
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
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
Lajos Molnar
9bde6e419e am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 
* commit 'a181da10ac5a7fc750d046e7789ba2244ee563b9':
  Fix broken @see javadoc in android.media.* classes
 2014-11-26 19:41:42 +00:00
vandwalle
b6c9cbc576 am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 
* commit '47772ac8e969fae53f8a3cef9066843fe20cae70':
  make startScan with worksource specific to location scans
 2014-11-26 19:41:36 +00:00
Jeff Sharkey
cd5d46ff81 am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev 
* commit '293f0f380b514658f63474b714053fda0e92569f':
  package_info GID shouldn't have write.
 2014-11-26 19:41:31 +00:00
Lajos Molnar
a181da10ac Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 2014-11-26 19:14:26 +00:00
vandwalle
47772ac8e9 Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 2014-11-26 19:05:02 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313a.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00
Jeff Sharkey
d76737a732 am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit 'b802cd6767c43a85645279a67bb41320058fdb60':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-26 18:59:13 +00:00
Ignacio Solla
59565277d9 am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK." 
* commit 'c67b21fa3ff17a1003dc805bb456c41a98bdf964':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-26 18:59:06 +00:00
Jeff Sharkey
293f0f380b Merge "package_info GID shouldn't have write." into lmp-mr1-dev 2014-11-26 18:49:33 +00:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit d550f9028e)
 2014-11-26 18:49:01 +00:00
Geoff Mendal
fe27981326 am 42acb728: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '42acb728272feccb1d61ccbbf778ee955053d79e':
  Import translations. DO NOT MERGE
 2014-11-26 18:45:36 +00:00
John Spurlock
b20cdd3b6b am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 18:45:10 +00:00
Geoff Mendal
06e83b3d5a am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd075d2f7594df21c94bae63bce4ed4d797baaef8':
  Import translations. DO NOT MERGE
 2014-11-26 18:45:04 +00:00
Jeff Davidson
228e2c2627 am daa699ce: am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 
* commit 'daa699ce1dea7882ee7d9f7704a18ca619285a9b':
  Handle package changes in NetworkScoreService.
 2014-11-26 18:44:55 +00:00
Jeff Davidson
480580775e am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'e5454d5733a4216a5ad0efb158fe090b19faddf1':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 18:44:46 +00:00
Geoff Mendal
20dd965559 am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9641feee025cfd669cd4730bb0609ba16aaffc2a':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:30 +00:00
Geoff Mendal
2bf691436b am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'cb3a6f89f1d05f93eaf7b779a28d613d0c123729':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:25 +00:00
Geoff Mendal
ad9889bbd9 am 3efcd8da: (-s ours) am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3efcd8da613184e58ea1b23d37c1ad3bd2a141ca':
  Import translations. DO NOT MERGE
 2014-11-26 18:43:57 +00:00
Jorim Jaggi
199d621c5f am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit 'f1b05619cc44b039721110955695fa261f1746da':
  Fix jank when pin/pattern is shown
 2014-11-26 18:43:52 +00:00
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
Geoff Mendal
63aa80f6ed am 57086523: (-s ours) Import translations. DO NOT MERGE 
* commit '57086523d593e04db69e5ed75987c669b809176b':
  Import translations. DO NOT MERGE
 2014-11-26 18:43:39 +00:00