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

105146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
5f9e5362da am 249dfff8: am 30cb1234: am efb6884c: am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit '249dfff87f49609d645b69737ac2fccc21fa9128':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:52:21 -07:00
Scott Main
249dfff87f am 30cb1234: am efb6884c: am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit '30cb1234882d1263dab06ae773373d97a614f495':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:50:40 -07:00
Scott Main
30cb123488 am efb6884c: am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit 'efb6884c3640b4c5f1307b8d109cc740597c6cfb':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:47:27 -07:00
Scott Main
efb6884c36 am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit '3ff6653525fbda7e1bf5e06f59b5474e390f6de1':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:44:16 -07:00
Scott Main
3ff6653525 add notice about corrupt DMG message 
bug: 8859130

Change-Id: I6fffcbdd7d57235cb1fdc9861b569f6feedba6c5
 2013-05-20 14:35:30 -07:00
Alex Klyubin
50d3338d9e am c8c3c797: am 8cd5592c: am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit 'c8c3c797e2f30bf0b71c5acb2521f0f4beef8bf9':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:16:57 -07:00
Alex Klyubin
c8c3c797e2 am 8cd5592c: am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '8cd5592c5fc2d13e7ab60b2cd25dd9cc90e1e124':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:15:17 -07:00
Alex Klyubin
8cd5592c5f am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit 'bce05d9125d7c9bf536bc6cb1758c7cd3e485166':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:13:19 -07:00
Alex Klyubin
bce05d9125 am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '45e56fd5e1d3747cc1a9f1ecd5883ee491bff532':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:10:39 -07:00
Alex Klyubin
45e56fd5e1 cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 
Switch APK signing from MD5WithRSA to SHA1WithRSA.

While we're at it, remove duplicates of app-signing.jd.

Change-Id: I3b5441bc61107a4f6d9b67366517785e6792cf9e
 2013-05-20 14:05:56 -07:00
Alex Klyubin
e34418471e am 791d76bb: Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 
* commit '791d76bb3e0a79106adae02139650ff2b56a31e9':
  Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 13:56:44 -07:00
Alex Klyubin
791d76bb3e Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 2013-05-20 20:51:58 +00:00
Alex Klyubin
0aa559b263 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
While we're at it, remove duplicates of app-signing.jd.

Bug: 9000563
Change-Id: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276
 2013-05-20 13:47:09 -07:00
Chet Haase
e8d6dc4cad am 865cffc7: Merge "Add null check in ViewOverlay" into jb-mr2-dev 
* commit '865cffc7cece8f10a9e6aab1e89a92c8794cb279':
  Add null check in ViewOverlay
 2013-05-20 13:43:36 -07:00
Chet Haase
865cffc7ce Merge "Add null check in ViewOverlay" into jb-mr2-dev 2013-05-20 20:40:37 +00:00
Baligh Uddin
13137ea15d am 3ee2977c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '3ee2977c442beb23c39f7b8deb300625c9f10c1a':
  Import translations. DO NOT MERGE
 2013-05-20 12:54:49 -07:00
Baligh Uddin
3ee2977c44 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-20 19:53:00 +00:00
Scott Main
f3a5682bba am 412633ba: am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit '412633baa05c7090015c35e0c6645e337cd7cd14':
  update video playlists and marquee announcements
 2013-05-20 12:35:57 -07:00
Scott Main
412633baa0 am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit '2cca8962327b2d988bf5172e4142268fa3795b57':
  update video playlists and marquee announcements
 2013-05-20 12:33:00 -07:00
Scott Main
2cca896232 am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f657689ab5b7d46e5f3c9dd376c0cb89479a1075':
  update video playlists and marquee announcements
 2013-05-20 12:30:38 -07:00
Scott Main
f657689ab5 am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements
 2013-05-20 12:28:54 -07:00
Scott Main
f943b6def7 Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 2013-05-20 19:26:49 +00:00
Scott Main
9994769f42 update video playlists and marquee announcements 
Change-Id: I853a30370bb79d3f392da11e24358c15d42005e5
 2013-05-20 12:23:58 -07:00
Robert Greenwalt
dfbf9901b4 am 5c11e8ee: Fix off-by-1 error in timing 
* commit '5c11e8ee5463b88907814e3e8716af292f90fb86':
  Fix off-by-1 error in timing
 2013-05-20 09:43:17 -07:00
Baligh Uddin
8a080c5ebb Import translations. DO NOT MERGE 
Change-Id: I0cd3526ac4c444fbfc97265a9570259b5b0f3934
Auto-generated-cl: translation import
 2013-05-20 09:32:15 -07:00
Robert Greenwalt
5c11e8ee54 Fix off-by-1 error in timing 
If deferred action msg was delivered promptly it would end up
looking like it too needed to be deferred and then nothing
would end up getting done.

bug:9014777
Change-Id: I243df70463ebb9333efd6df510f71f9d8d9bdf91
 2013-05-20 09:28:08 -07:00
The Android Open Source Project
2eed10ac3f Reconcile with jb-mr2-release - do not merge 
Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702
 2013-05-20 08:20:20 -07:00
Chet Haase
d8b0b23324 Add null check in ViewOverlay 
View.getOverlay().clear() can failed with an NPE if there are
no drawables in the overlay. Fix: add a null check before dereferencing
the mDrawables field.

Issue #8895794 getOverlay.clear() crashes if drawables were not added previously

Change-Id: I9b2a63036450915681ba3a89a0911e2490063702
 2013-05-20 07:57:02 -07:00
The Android Automerger
1f3fa2cfeb merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-20 05:55:17 -07:00
Robert Greenwalt
c3de50cd3c am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev 
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
  Add some temp wifi debugging output
 2013-05-19 12:49:44 -07:00
Robert Greenwalt
30c798d587 Merge "Add some temp wifi debugging output" into jb-mr2-dev 2013-05-19 19:46:58 +00:00
The Android Automerger
665191bb4b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-19 05:55:27 -07:00
John Spurlock
c6ab8a6147 am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev 
* commit 'd0154550e0d5e8dea5b65849747266f5fa0d2d5d':
  Deactivate notification listeners disabled at runtime.
 2013-05-19 01:23:30 -07:00
John Spurlock
d0154550e0 Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev 2013-05-19 08:03:48 +00:00
Robert Greenwalt
02ba86f0cc Add some temp wifi debugging output 
bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9
 2013-05-18 13:40:49 -07:00
John Spurlock
79f7892c10 Deactivate notification listeners disabled at runtime. 
PACKAGE_CHANGED is called when either the application or any
of its components change.  Rework old early exit code to
handle component-level disabling wrt listeners.

Note PACKAGE_CHANGED can take quite a while to reach NMS.
Up to ten seconds (!) after component-disabling in app.

Bug:8982243
Change-Id: Ia325516140dd9288466a663192a5326019f071ab
 2013-05-18 14:29:40 -04:00
Brett Chabot
6ffce75fa7 am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev 
* commit '154bb5597cbd3985e3ab86647c5feaa2e289e1a9':
  Fix PhoneWindowManager#getUserRotationMode
 2013-05-17 17:16:47 -07:00
Santos Cordon
8e3f01e90e am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev 
* commit 'c1de240457ad803c04c56fb3f63635966b862b43':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-17 17:16:45 -07:00
Brett Chabot
154bb5597c Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev 2013-05-18 00:15:25 +00:00
Santos Cordon
c1de240457 Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev 2013-05-18 00:14:14 +00:00
Santos Cordon
ba70136713 Update documentation of NEW_OUTGOING_CALL 
Adds call-handling as a use case for NEW_OUTGOING_CALL

bug: 8987211
Change-Id: Icd9c53a2dd1a5948a749e133600db21c2560fd1f
 2013-05-17 15:58:12 -07:00
Chris Wren
5baf581d58 am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev 
* commit '743054f5b3ad088b00adac44bb6d1f542d4375db':
  disable notification listeners on uninstall
 2013-05-17 15:08:19 -07:00
Chris Wren
743054f5b3 Merge "disable notification listeners on uninstall" into jb-mr2-dev 2013-05-17 22:06:14 +00:00
Michael Wright
1aa4bec5e4 am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices 
* commit '4361e1f46ef9e30c78679b5e2717b74d66191692':
  Remove assist swipe from TOUCH_NAVIGATION devices
 2013-05-17 14:57:25 -07:00
Michael Wright
4361e1f46e Remove assist swipe from TOUCH_NAVIGATION devices 
Bug: 9019927
Change-Id: I0a67ee00038b6fba7818f64ba02515767e34fe06
(cherry picked from commit 681a3d710402b80a8375a05172b1fb6f720295be)
 2013-05-17 21:30:02 +00:00
Romain Guy
25f6f4f5d0 am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev 
* commit '3c1ad55fcfa54c2c30073d07917da699d156dc58':
  Update Canvas.getClipBounds to not account for AA clips.
 2013-05-17 14:12:43 -07:00
Romain Guy
3c1ad55fcf Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev 2013-05-17 21:10:22 +00:00
Dianne Hackborn
cff74a08fb Fix issue #9000597: PackageManager get NPE while running performance plan 
Change-Id: I2bf777e8b15704d21320f95059d94648122396a8
 2013-05-17 13:49:04 -07:00
Dianne Hackborn
46449b8bbc am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev 
* commit 'd31db759cba78447ba1f4286a84c27a30a5aeb5c':
  Fix issue #9000597: PackageManager get NPE while running performance plan
 2013-05-17 13:34:30 -07:00
Dianne Hackborn
d31db759cb Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev 2013-05-17 20:31:44 +00:00