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

147080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
8fa9b7e743 am a7e1d873: am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev 
* commit 'a7e1d87386ebbd8d89f2d37a121840038c96af60':
  Bump refcount of canvas created for Picture
 2014-07-30 21:20:39 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Sean Wan
5ce8efc46a am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev 
* commit 'b4a0e3efc8dc5b26cbc2476c67b052914a2970bf':
  Fixed a NullPointerException in AccountManagerService.
 2014-07-30 21:16:54 +00:00
Robert Ly
317ffe91a6 am a5e5d455: Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev 
* commit 'a5e5d455c6cb605fd289a9147b80adf0a955addb':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 21:16:49 +00:00
Martijn Coenen
8330103ccf am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev 
* commit 'e5996ff428d5adb5d523878d67db347b1676b3bc':
  Make some NFC APIs @systemAPI.
 2014-07-30 21:16:45 +00:00
Raph Levien
8dbb94a899 am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev 
* commit 'c4445abba696f199eca2ad9943b51e84d016d494':
  Bump refcount of canvas created for Picture
 2014-07-30 21:16:41 +00:00
Joe Fernandez
9386003cb9 am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:14:39 +00:00
Alan Lau
d38347ec51 am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:14:33 +00:00
Alan Lau
6a93d9d346 am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:14:29 +00:00
Jason Monk
a7807f86c9 am 741f5c3a: am 6b21f4e6: Allow System UI access to VPN. 
* commit '741f5c3abf14e593f919de2bb558eeb012ae2951':
  Allow System UI access to VPN.
 2014-07-30 21:10:44 +00:00
Jason Monk
6a9ed4aa71 am 6b21f4e6: Allow System UI access to VPN. 
* commit '6b21f4e67d482cf765aac8c1d9dda38e1541b8ad':
  Allow System UI access to VPN.
 2014-07-30 21:06:20 +00:00
Jason Monk
e47df8466b Allow System UI access to VPN. 
Bug: 16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d
 2014-07-30 20:51:14 +00:00
Raph Levien
ed1e6962ba Merge "Bump refcount of canvas created for Picture" into lmp-dev 2014-07-30 20:38:44 +00:00
Raph Levien
febccd05f2 Bump refcount of canvas created for Picture 
Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.

Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
 2014-07-30 13:41:10 -07:00
Christoph Studer
8c0a9d425d am 2522c94a: am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev 
* commit '2522c94abf436f8886cfaac0e06ce4fcba364e82':
  SysUI: Display group children when no summary is present
 2014-07-30 20:28:28 +00:00
Chong Zhang
ad11edce7d am 351c277a: am baba0e42: fix for MediaCodecList bitrate range exception 
* commit '351c277a4ce741f3b5f323bf929f24d1ce0f7b0d':
  fix for MediaCodecList bitrate range exception
 2014-07-30 20:28:24 +00:00
Christoph Studer
9226f8a3b2 am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev 
* commit '6b8a27343fec2c72074adde1687d45d43fbb95d9':
  SysUI: Display group children when no summary is present
 2014-07-30 20:21:08 +00:00
Chong Zhang
6f3c284ed7 am baba0e42: fix for MediaCodecList bitrate range exception 
* commit 'baba0e4282e875271b79912135bd6418f58913b1':
  fix for MediaCodecList bitrate range exception
 2014-07-30 20:20:59 +00:00
Ye Wen
12d3bebe69 am 13f2726f: am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev 
* commit '13f2726fa7100fed13cd10f42b9eb3559f0a9aa0':
  Move archived column from pdu/sms to threads (1/4)
 2014-07-30 20:20:38 +00:00
Ye Wen
7b58ac80c0 am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev 
* commit 'e13e2eefca4db78cd80cb36bd79074934b1d32b4':
  Move archived column from pdu/sms to threads (1/4)
 2014-07-30 20:16:49 +00:00
Julia Reynolds
ac30592194 am 5e625843: am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev 
* commit '5e62584377fa3002d45b56d7e28b11dff9fd35b1':
  API council - DISALLOW_APPS_CONTROL -- need better documentation.
 2014-07-30 20:16:33 +00:00
Chong Zhang
cad266aad9 fix for MediaCodecList bitrate range exception 
Bug: 16627391

Change-Id: I8c5ba580d7b875d1e2a0ebbf398cf65dd5c4555f
 2014-07-30 20:15:03 +00:00
Julia Reynolds
d133e05e5f am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev 
* commit '72746e415e325a9d54a19f8c82fdbd98b9d3658b':
  API council - DISALLOW_APPS_CONTROL -- need better documentation.
 2014-07-30 20:08:15 +00:00
Geoff Mendal
3ca2207a7d am 1ee08b8f: (-s ours) am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1ee08b8fec431ec9cc0efee516996374e3a5ead0':
  Import translations. DO NOT MERGE
 2014-07-30 19:55:22 +00:00
Geoff Mendal
bc658872e4 am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6764ce228db63bcb8e2f33ad8acbff878090e434':
  Import translations. DO NOT MERGE
 2014-07-30 19:51:14 +00:00
Christoph Studer
f6b08e04e1 am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '0b928f7dde70525ba55e1963adc93a44a81383e6':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:41:34 +00:00
Derek Sollenberger
aff4a4df56 am 0a9309c7: am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev 
* commit '0a9309c70b16eaa661addba20fe8273f3f5d1e98':
  Disable fallback chaining in Skia.
 2014-07-30 19:41:29 +00:00
Christoph Studer
0de6eb9db8 am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '572532d089d15057c5e00a1d7fcf926d7555299f':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:36:45 +00:00
Derek Sollenberger
f875fdf4fc am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev 
* commit '673af5582dda0d0cb8a3667fbadef747d22193f1':
  Disable fallback chaining in Skia.
 2014-07-30 19:36:41 +00:00
Geoff Mendal
1a29f39c83 am 2dfcad67: (-s ours) am 9d832d1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '2dfcad67bf75405e6d2858ad89ae58b3d00e1cc3':
  Import translations. DO NOT MERGE
 2014-07-30 19:32:54 +00:00
Craig Mautner
6a58309e73 Merge "[ActivityManager] Prevent coredump file may not complete for testing." 2014-07-30 19:31:16 +00:00
riddle_hsu
8062b9534f [ActivityManager] Prevent coredump file may not complete for testing. 
Sympton:
During testing, skip kill native crash process manually because it will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash process will be killed immediately that results incomplete coredump file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494
 2014-07-31 03:53:04 +00:00
Craig Mautner
905fe15ea0 Merge "[ActivityManager] Avoid mistaking visibility by finishing task." 2014-07-30 19:31:16 +00:00
Andres Morales
e9a8927662 Merge "Revert "NFC Unlock api changes"" into lmp-dev 2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d Revert "NFC Unlock api changes" 
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
 2014-07-30 21:30:50 +00:00
Robert Ly
36da7fe10f Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev 2014-07-30 19:31:16 +00:00
Robert Ly
0f9ea26dcc resolved conflicts for merge of 60e7f541 to lmp-dev 
Conflicts:
	docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c
 2014-07-30 14:09:25 -07:00
Geoff Mendal
5d1fbe7d4a am 9d832d1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '9d832d1e324cc1bee418b68d285b2a08b3a22fa8':
  Import translations. DO NOT MERGE
 2014-07-30 19:29:15 +00:00
Sandeep Siddhartha
7fcbce032a am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit 'ae7848f4d0a40bf1f9205a9d0988c59dfcfdfe89':
  Make startRecognition async
 2014-07-30 19:10:57 +00:00
Sandeep Siddhartha
3aebb32267 am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit '059ffa19ae00611f53da5c817ad21587e2057149':
  Make startRecognition async
 2014-07-30 19:07:20 +00:00
Jose Lima
e3754d0ae7 am 0d8fe95d: am 28ba97e3: Added LEANBACK_SETTINGS Intent category 
* commit '0d8fe95d36c10fc62e78ab9f36aa49440b278e5c':
  Added LEANBACK_SETTINGS Intent category
 2014-07-30 19:05:53 +00:00
Jose Lima
9b51ad4d30 am 28ba97e3: Added LEANBACK_SETTINGS Intent category 
* commit '28ba97e3c095f61765504435c7f8725e48ab09ff':
  Added LEANBACK_SETTINGS Intent category
 2014-07-30 19:00:05 +00:00
Adam Lesinski
1eb61008dc am ca5fb0dc: am c6240e72: Fix large memory corruption in AAPT 
* commit 'ca5fb0dccde2b2552f1374957b3a2a170ef39238':
  Fix large memory corruption in AAPT
 2014-07-30 18:57:29 +00:00
Jose Lima
73915cf2ca Added LEANBACK_SETTINGS Intent category 
- Added new Intent category (as a hidden/system API) to be
     used to identify Leanback settings activities that should
     be listed in the Leanback launcher.

Change-Id: Ia31244fb87a66f63ddad562e02e577111573d728
 2014-07-30 18:56:25 +00:00
Adam Lesinski
23e6d3a2de am c6240e72: Fix large memory corruption in AAPT 
* commit 'c6240e72855a978e31756b0be6bc83e0afdd17bf':
  Fix large memory corruption in AAPT
 2014-07-30 18:51:18 +00:00
Paul Jensen
9c3a0cb150 am 4d00f65c: am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev 
* commit '4d00f65c68746a660779bd353af822ddd13ae1cd':
  Use a new socket for each of the host's IP addresses.
 2014-07-30 18:49:52 +00:00
Adam Lesinski
57079519f4 Fix large memory corruption in AAPT 
When assigning a new string pool to a package, don't release the
reference to the old memory immediately, as the cleanup code that
is called after references the old memory.

Bug: 16155257
Change-Id: I3eaeb81191b71a282a0ef82856023f09707f1b17
 2014-07-30 18:46:51 +00:00
Paul Jensen
ca9fb9c69f am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev 
* commit '43293a8b947508b66efdc36f7d52435d537dddb6':
  Use a new socket for each of the host's IP addresses.
 2014-07-30 18:43:36 +00:00
Nicolas Prevot
80ee6bdc2d am 8c94276a: am 58e96946: Using the selector to check if an intent can be forwarded. 
* commit '8c94276af983b20f725ce89767f979e2a2208e73':
  Using the selector to check if an intent can be forwarded.
 2014-07-30 18:38:28 +00:00
Nicolas Prevot
bfb22aeaf0 am 58e96946: Using the selector to check if an intent can be forwarded. 
* commit '58e9694623705b3916f0256c26c88ea3ae18b47b':
  Using the selector to check if an intent can be forwarded.
 2014-07-30 18:35:46 +00:00