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

108029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
a1b02dbb6e Fix build break due to javadoc linking error 
Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a
 2013-06-11 15:25:20 -07:00
Scott Main
239f3eec6b add ninepatch search tag 
Change-Id: Ia53e839abfccffe316b54e62da9bd89011f2251a
 2013-06-11 15:08:54 -07:00
Ken Sumrall
8b8675f2dd Merge "Don't wait for the MountService to be ready when encrypting" 2013-06-11 22:07:27 +00:00
Christopher Tate
1bc14ed9c3 am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev 
* commit '76b76666f5c28751db6ed8791fd54ec430d4361a':
  Need to explicitly disable scan-always when turning off wifi
 2013-06-11 15:07:00 -07:00
Christopher Tate
76b76666f5 Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev 2013-06-11 22:04:38 +00:00
The Android Open Source Project
799f031a64 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139
 2013-06-11 14:56:52 -07:00
Dianne Hackborn
21ab6f4991 ArrayMap is great, so how about ArraySet! 
Also a few little tweaks to the ArrayMap implementation.  Note that
these are fairly parallel implementations; I looked at what I could
abstract out as a base class, but there isn't really all that much without
making the resulting code more general and thus slower.  If we kept
the data structure for ArraySet the same as map, where the array has
two values per entry, then they could probably share a lot of code.
I couldn't really bring myself to do that at this point, though...

Change-Id: I9e0dd8baa8e1febcc1033ecef61623ad59ce4aae
 2013-06-11 14:37:54 -07:00
Jeff Sharkey
fea17de7aa Explicit locale when formatting machine strings. 
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
 2013-06-11 14:36:41 -07:00
Dianne Hackborn
cbfd23ee6f Add new API to retrieve a dumpsys of a single package. 
Adds a platform API, and pm command.  Fixes some issues with
dumping per-package data in package manager, makes battery
stats able to dump per-package state.

Change-Id: I76ee6d059f0ba17f7a7061886792b1b716d46d2d
 2013-06-11 14:26:53 -07:00
Daniel Sandler
ea28f9bc62 am 4a9fcaf4: am cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev 
* commit '4a9fcaf49f6da3f28334bb8e5eddea51c0b6fc59':
  Add LTE overlays for signal strength indicators.
 2013-06-11 14:13:58 -07:00
Zhihai Xu
352e56ee97 am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 
* commit '36e90664c7b74bd90b56b17afb407729f7949108':
  Let RemoteControlDisplay know more about playback position
 2013-06-11 14:13:56 -07:00
Scott Main
3ae015bc7d am 994c7b47: am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '994c7b4768b661f86542a1096b199f772e8a94a2':
  replace obsolete links. bug: 9380063
 2013-06-11 14:13:53 -07:00
Marco Nelissen
8d7f9f813d am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:13:51 -07:00
Scott Main
06c05c4070 am be173f6a: am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 
* commit 'be173f6a16619ed82469bda7cf0df7c3763d3c81':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-11 14:13:48 -07:00
Scott Main
a14bd3045b am 2ccb564d: am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit '2ccb564d8066972847d8a5e4b8820c72638134b1':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-11 14:13:46 -07:00
Baligh Uddin
0f195aa548 am 26560925: (-s ours) am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '26560925f7326f8144d5b58419adb6b24bb9a0fd':
  Import translations. DO NOT MERGE
 2013-06-11 14:13:43 -07:00
Ashish Sharma
59dd0e6ce2 am c8aa0b49: am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev 
* commit 'c8aa0b49a6aa766c905e7da516c24af1c34710e3':
  Do not allow 0 or smaller periodicity for syncs. b/9295383
 2013-06-11 14:13:40 -07:00
John Spurlock
79f71d1091 am 46ae4122: am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev 
* commit '46ae41221f18235f72c7de47ca124254a89dc1f4':
  Save Notification large icon to extras.
 2013-06-11 14:13:37 -07:00
Scott Main
81888d5661 am 26bc073d: am fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev 
* commit '26bc073dfa32c8122ce194cfc39e2dfc44370fcd':
  add NA message for any "signature" level permissions
 2013-06-11 14:13:35 -07:00
Chris Craik
e13fb01d25 am 8cb26c09: am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev 
* commit '8cb26c099dc6357340141c9d81a1131ee404ae41':
  Workaround possible use after delete
 2013-06-11 14:13:32 -07:00
Daniel Sandler
ffcec1d4bd am 0a2ff8db: am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 
* commit '0a2ff8db4339261d701ad542ac770fb92bf2127b':
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
 2013-06-11 14:13:28 -07:00
Daniel Sandler
4a9fcaf49f am cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev 
* commit 'cd5b3310e23b918fe7f49352e28f7d1b69ca859c':
  Add LTE overlays for signal strength indicators.
 2013-06-11 14:11:29 -07:00
Zhihai Xu
36e90664c7 am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 
* commit 'bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
  Let RemoteControlDisplay know more about playback position
 2013-06-11 14:11:19 -07:00
Scott Main
994c7b4768 am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '276c72b714f0dc1b5aa49cf78924cd2af09b4c8b':
  replace obsolete links. bug: 9380063
 2013-06-11 14:10:29 -07:00
Marco Nelissen
3826e8bd6e am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:10:26 -07:00
Scott Main
be173f6a16 am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 
* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-11 14:10:18 -07:00
Scott Main
2ccb564d80 am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 
* commit '938e8b67c2c9d0e4c797a317a10148be42aa80ec':
  fix typo and clarify class references in database lesson bug: 9372560
 2013-06-11 14:10:16 -07:00
Baligh Uddin
26560925f7 am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'ebb17713dac153a0efdbb9ec102b8a6a99242f5f':
  Import translations. DO NOT MERGE
 2013-06-11 14:10:03 -07:00
Ashish Sharma
c8aa0b49a6 am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev 
* commit '58100fb813f4a68386757fc80244dbb756ea35d5':
  Do not allow 0 or smaller periodicity for syncs. b/9295383
 2013-06-11 14:09:56 -07:00
John Spurlock
46ae41221f am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev 
* commit 'a9221987c047a9a05da9cc4f3446a0d581494a85':
  Save Notification large icon to extras.
 2013-06-11 14:09:53 -07:00
Scott Main
26bc073dfa am fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev 
* commit 'fe7c2220a129d3bea753f14f111b4f6e335de237':
  add NA message for any "signature" level permissions
 2013-06-11 14:09:47 -07:00
Chris Craik
8cb26c099d am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev 
* commit 'cb5d644fb8956962b6a89f8d384b16819af5fdf9':
  Workaround possible use after delete
 2013-06-11 14:09:41 -07:00
Daniel Sandler
0a2ff8db43 am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 
* commit '4e5694aaa7e03723e248c0d1e47e5a322c403a90':
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
 2013-06-11 14:09:38 -07:00
Daniel Sandler
cd5b3310e2 Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev 2013-06-11 20:57:39 +00:00
Igor Murashkin
cf88be6dc8 Merge "camera: Add Java binder proxies for some existing binder interfaces" 2013-06-11 20:45:19 +00:00
Zhihai Xu
bcc6ae88f9 Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 2013-06-11 19:38:59 +00:00
Igor Murashkin
4491d684f4 camera: Add Java binder proxies for some existing binder interfaces 
Note that anything not in the AIDL interfaces, will NOT be magically
compatible if you just add it there. It probably requires a change in
frameworks/av/camera as well.

Bug: 9213377
Change-Id: I91d3efb755ed2e3ace139f83573f86efdccccd06
 2013-06-11 11:36:38 -07:00
Dmitry Shmidt
28dd15b2d4 softap: Match new config format 
Change-Id: Ic83a73678149aa56069c4a13d87e38de66243aa3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-06-11 11:05:32 -07:00
Amith Yamasani
570c741240 Merge "Hide "Take bugreport" for secondary users" 2013-06-11 17:47:45 +00:00
John Spurlock
f2874910d4 Merge "Log errors found in notification listener callbacks." 2013-06-11 17:20:41 +00:00
Baligh Uddin
728dfd7705 Merge "Import translations. DO NOT MERGE" 2013-06-11 15:33:07 +00:00
Baligh Uddin
74de286e09 Merge "Import translations. DO NOT MERGE" 2013-06-11 15:31:32 +00:00
Scott Main
276c72b714 am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '8f6788786bdd36e26b6219b94ce7288115e020af':
  replace obsolete links. bug: 9380063
 2013-06-11 08:03:22 -07:00
Scott Main
8f6788786b am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '6e15b52e712d4c1836a06c579452ce872c1dfd91':
  replace obsolete links. bug: 9380063
 2013-06-11 08:01:13 -07:00
Scott Main
6e15b52e71 am 7728e1d6: replace obsolete links. bug: 9380063 
* commit '7728e1d6543df2758687b4b62b9c626d1c3e59dd':
  replace obsolete links. bug: 9380063
 2013-06-11 07:59:18 -07:00
Scott Main
7728e1d654 replace obsolete links. 
bug: 9380063

Change-Id: Ib40ce359bfd5f44494c5b378e768d73011c29636
 2013-06-11 07:54:31 -07:00
Torne (Richard Coles)
eb07f3cad0 WebViewChromium: don't use a separate class loader. 
Use the ordinary system class loader to load the Chromium-based WebView
implementation classes now that the implementation .jar is part of the
boot class path. Instead of checking for the .jar file's existence, just
check to see if we can load the class to determine whether the new
WebView is available.

This also removes the check for Build.IS_DEBUGGABLE; the Chromium-based
WebView will now be available in user builds if enabled in the developer
options.

Change-Id: I06bae9b91656aa41b09c0e6f63f90736db993418
 2013-06-11 14:26:44 +01:00
The Android Automerger
257cc10c95 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-11 05:55:18 -07:00
Marco Nelissen
374904621a Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 2013-06-11 04:01:47 +00:00
Romain Guy
a4cda4d643 Merge "Make constants final" 2013-06-11 01:26:23 +00:00