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

84162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geremy Condra
b631084613 DO NOT MERGE Add components for the Android Config Updater to system server. 
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
 2012-09-12 17:53:53 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
743115ffcd Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 2012-09-12 11:20:37 -07:00
Elliott Hughes
6cfba16c25 am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:08:45 -07:00
Elliott Hughes
40ad466e4e am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '4c686dad83b6712e0e1abab6aba9c7bb683000b2':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:06:56 -07:00
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:04:45 -07:00
Scott Main
c4091423d8 am 53d1864c: am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '53d1864c100ba6562b3077d662a063356b9584ce':
  fix another link in the style doc
 2012-09-12 10:46:00 -07:00
Scott Main
53d1864c10 am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '8dc0ff07c9713945b0075dd1010057a47cb8c40b':
  fix another link in the style doc
 2012-09-12 10:43:57 -07:00
Scott Main
8dc0ff07c9 Merge "fix another link in the style doc" into jb-dev 2012-09-12 10:41:20 -07:00
Scott Main
816518fa59 fix another link in the style doc 
Change-Id: Icd40456ab32232eacc6fa3acdd86ff78aa03e3aa
 2012-09-12 10:40:29 -07:00
Marco Nelissen
a962d749ed Merge "EffectsTest enhancements" into jb-mr1-dev 2012-09-12 10:25:53 -07:00
Elliott Hughes
cceed1dfe1 Merge "Include <sys/socket.h> instead of <linux/socket.h>." 2012-09-12 10:13:28 -07:00
Scott Main
048279126f am eb0b6e27: am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit 'eb0b6e272f63d7685bc147107c87b5d6235c07e5':
  fix links to style and themes source files
 2012-09-12 10:13:25 -07:00
Scott Main
eb0b6e272f am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit '94b2b5efa017138663e00e23e138333149641023':
  fix links to style and themes source files
 2012-09-12 10:11:00 -07:00
Scott Main
94b2b5efa0 Merge "fix links to style and themes source files" into jb-dev 2012-09-12 10:08:36 -07:00
Scott Main
600a75c31f fix links to style and themes source files 
Change-Id: I49759c689c3d345be014c7a252e266d7529af230
 2012-09-12 10:05:38 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47 
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
 2012-09-12 10:01:00 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public. 
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
 2012-09-12 08:04:26 -07:00
The Android Open Source Project
568e3ebb5e am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '4b0764eef22e3244d3f45fbda1e093ff11986f5f':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 07:51:44 -07:00
The Android Open Source Project
4b0764eef2 Reconcile with jb-mr0-release - do not merge 
Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977
 2012-09-12 07:49:49 -07:00
Jeff Sharkey
8b29d63d08 Merge "Include user identifier in external storage paths." into jb-mr1-dev 2012-09-11 23:36:50 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
 2012-09-11 23:11:14 -07:00
Daniel Sandler
de3debd9f5 Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 22:20:12 -07:00
Daniel Sandler
40c6ae4d22 Single finger notification expansion. 
If you liked these changes...

  Change Ie4e79aa5
  Change I8a6f8606
  Change I824937e9
  Change I957b6d50

You'll love this one!

Change-Id: I5256366175fa7ebc965b1c5df02f10ba802ed977
 2012-09-11 22:19:50 -07:00
Daniel Sandler
8a0e1fefee am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit 'b802699618ead6c91c862817744fbde72adb4b38':
  Fix notification gestures.
 2012-09-11 21:40:07 -07:00
Daniel Sandler
ec4c62bfe5 am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit '2da1e2215fb22b5aa9a18c6c96f0d3a4f8b25574':
  Single finger notification expansion.
 2012-09-11 21:37:17 -07:00
Daniel Sandler
b802699618 am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit 'e445c25877bac16ea4438057f37bc668315133cd':
  Fix notification gestures.
 2012-09-11 21:30:49 -07:00
Daniel Sandler
2da1e2215f am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit 'a5e042f9232c26505968d8add60f3f84c6a87dae':
  Single finger notification expansion.
 2012-09-11 21:29:06 -07:00
Daniel Sandler
e445c25877 Merge "Fix notification gestures." into jb-dev 2012-09-11 21:19:23 -07:00
Daniel Sandler
a5e042f923 Merge "Single finger notification expansion." into jb-dev 2012-09-11 21:17:41 -07:00
Elliott Hughes
778c859bfd Include <sys/socket.h> instead of <linux/socket.h>. 
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.

Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
 2012-09-11 18:50:25 -07:00
Jeff Brown
c7b6ec7a7c Merge "Improve reporting of wifi connection state." into jb-mr1-dev 2012-09-11 18:47:37 -07:00
Daniel Sandler
c0229e29de Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 21:46:39 -04:00
Svetoslav Ganov
5e900e3a17 Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev 2012-09-11 18:16:14 -07:00
Svetoslav Ganov
3e1476a697 Adding a scaling threshold in ScreenMagnifier 
Change-Id: I1fdd7c93de571a61d88d7386c5c2a423a6b83fb9
 2012-09-11 18:15:17 -07:00
Jean-Baptiste Queru
d057e73e7e am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit 'c095eb04fa931c1d838fc4505089502ecc9eba62':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 18:03:43 -07:00
Jean-Baptiste Queru
c095eb04fa am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:59:14 -07:00
Jean-Baptiste Queru
70a5967e0b am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:57:19 -07:00
Svetoslav Ganov
b1ee588602 Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev 2012-09-11 17:50:53 -07:00
Svetoslav Ganov
d420e3ac94 Refactoring the scale and pan detection in the ScreenMagnifier. 
Change-Id: I8560f53f88ef0c9244e2b48d40119574cacb544f
 2012-09-11 17:48:28 -07:00
Jean-Baptiste Queru
5c09d60567 Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 2012-09-11 17:48:09 -07:00
Romain Guy
0585744a2d Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev 2012-09-11 17:32:05 -07:00
Romain Guy
45e4c3df6c Discard framebuffer commands when we redraw the entire buffer 
Change-Id: I32e3014832cbd3bdbace8c3d2206eb20a2002d64
 2012-09-11 17:30:43 -07:00
Winson Chung
709c542b67 Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev 2012-09-11 17:10:43 -07:00
Winson Chung
6072b00b62 Fixing crash in emulator due to missing bluetooth. 
Change-Id: I0f652198cc759fac44f0de1729fcb52f515071a3
 2012-09-11 17:10:32 -07:00
Jeff Brown
f8f0eddd07 Improve reporting of wifi connection state. 
We should only report that the wifi display is connected
after the RTSP connection has been fully established.

Change-Id: Ifc6bc5d5cebd42d551026885b31cbc74b7ece2b1
 2012-09-11 17:05:11 -07:00
Benoit Goby
73e0d75c9d Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev 2012-09-11 16:14:47 -07:00
Amith Yamasani
9c673b0536 Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev 2012-09-11 16:12:16 -07:00
Benoit Goby
45f6aaa558 UsbDebuggingActivity: Strings update after review 
Bug: 7056209
Change-Id: I447b021973332414e5e57a3b7066bf25dfccb628
 2012-09-11 16:10:35 -07:00