11733 Commits

Author SHA1 Message Date
Wink Saville
7ab34954c8 am 97b077bc: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '97b077bc18752e7dafe041cb04c19e67ce69939c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:01 -07:00
Wink Saville
97b077bc18 am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:53 -07:00
Wink Saville
925ec03fcd Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:59:03 +00:00
Amith Yamasani
abee69bc08 am 8361a9f7: am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '8361a9f719b6a416a40134951daf28297b6e0670':
  Pass along the user id to AttributeCache requests
2013-07-12 11:25:24 -07:00
Amith Yamasani
8361a9f719 am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
  Pass along the user id to AttributeCache requests
2013-07-12 11:21:27 -07:00
Amith Yamasani
06a441de3b Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 2013-07-12 18:17:09 +00:00
Lorenzo Colitti
51a845688c Merge "Make legacy VPN work over stacked interfaces." 2013-07-12 03:33:20 +00:00
Vinit Deshapnde
e088428400 Merge "Allow enabling TDLS on specific routes" 2013-07-12 00:58:07 +00:00
Vinit Deshapnde
64f0d5ba15 Allow enabling TDLS on specific routes
This change exposes couple of internal APIs to enable TDLS between local
machine and a remote machine. The implementation translates client provided
remote IP to a MAC address using system ARP cache, and then instructs the
driver to enable TDLS with that endpoint. Another API takes application
specified MAC address.

Bug: 8538898

Change-Id: Ida343fc42ba3a817a4f380255596e7fb7fcdfb9b
2013-07-11 15:12:44 -07:00
Lorenzo Colitti
41fb98c868 Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).

Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.

Bug: 9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
2013-07-11 18:15:48 +09:00
Wink Saville
8cf3560469 VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 23:00:07 -07:00
Dianne Hackborn
9865ef1ba5 Merge "Add -c option to meminfo to dump a compact form." 2013-07-11 02:03:33 +00:00
Dianne Hackborn
20cdcee47d Add -c option to meminfo to dump a compact form.
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.

Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
2013-07-10 18:47:04 -07:00
Amith Yamasani
4befbecfcc Pass along the user id to AttributeCache requests
Bug: 9759331
Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117
2013-07-10 16:18:01 -07:00
Craig Mautner
fb20eb48aa Merge "Add convertToTranslucent to API." 2013-07-10 21:52:28 +00:00
Kenny Root
3b4d69508a Merge "KeySetManager: convert comments to Javadoc" 2013-07-10 19:35:49 +00:00
Dianne Hackborn
1304f4ae32 Add new location monitoring op, make some of app ops public.
The new location monitoring op is to tell us when an application
is monitoring for any location changes.  It may be useful information
in addition to the more explicitly information about when location
data actually goes to the app.

Also make parts of AppOpsManager public for use by gcore.  It is
not available to third party apps.

Change-Id: Ib639f704258ffdd7f3acd7567350ed2539da628a
2013-07-09 18:17:27 -07:00
Craig Mautner
5eda9b3301 Add convertToTranslucent to API.
Rename convertToOpaque to convertFromTranslucent. Add the
counterpart to Activity.convertFromTranslucent() for returning from
opaque to a translucent Activity. The caller should wait until
TranslucentConversionListener.onTranslucentConversionComplete() is
called before actually changing the background to translucent.

Change-Id: Id04b026bcc4dd8bad9a33a7af126e1bb28fb9c03
2013-07-09 14:50:12 -07:00
Amith Yamasani
235e817c80 Merge "Clean up any restrictions files that shouldn't be there." 2013-07-09 18:32:41 +00:00
Amith Yamasani
b82add27d0 Clean up any restrictions files that shouldn't be there.
Partially fixes the mess that was caused by #9681399

Change-Id: Iaabe15c87d1b002f0b2210b34adcc31b8fb4329c
2013-07-09 11:24:44 -07:00
Satoshi Kataoka
42e230cdb4 Merge "Consolidate InputMethodUtils" 2013-07-09 14:42:18 +00:00
Satoshi Kataoka
b282726d86 Consolidate InputMethodUtils
Change-Id: Ib5a5f3af8ea9eaaa81697d13c20abe28121e7373
2013-07-09 23:20:06 +09:00
Dianne Hackborn
a4cc205ee8 More procstats work.
The historical data is now a more central part of the stats.
When a checkin happens, the data is not deleted, just marked
as checked in so we can continue to access it.

The default procstats dump is now a new "summary" mode that
shows a more useful set of data for all of the running processes.
By default the current and all committed states are shown; you
use "--current" to only show the current.  Use "--details" to
get the previous more detailed data (which now includes detailed
process data like the per-package data).

Also tweaked uid printing to be a little more compact.

Change-Id: I5414ea7c07134ebd5dc83f6f7b9f6e30151eda85
2013-07-08 18:06:24 -07:00
Kenny Root
2042e9df48 KeySetManager: convert comments to Javadoc
To help with development, change comments to Javadoc and adding some
links.

Change-Id: Id97febd978f14bace8242d8e0610b1166a13265b
2013-07-08 16:28:35 -07:00
Kenny Root
ee302758d6 Merge "KeySetManager: change KEYSET_NOT_FOUND to public" 2013-07-08 20:25:27 +00:00
Jean-Baptiste Queru
619682dfae am 58d52298: am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers."
* commit '58d52298bebe21c4fb79ec8fc5e1c76a7503e0a5':
  Set foreground priority for shutdown receivers.
2013-07-08 12:22:59 -07:00
Jean-Baptiste Queru
58d52298be am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receivers."
* commit '57512008e2f9f1f04ff5a11b522533c753ed36fe':
  Set foreground priority for shutdown receivers.
2013-07-08 12:20:15 -07:00
Jean-Baptiste Queru
57512008e2 am 8f793103: Merge "Set foreground priority for shutdown receivers."
* commit '8f793103d81e988e2ef25ecdfde1b279e299a97e':
  Set foreground priority for shutdown receivers.
2013-07-08 12:15:30 -07:00
Jean-Baptiste Queru
8f793103d8 Merge "Set foreground priority for shutdown receivers." 2013-07-08 19:01:26 +00:00
Craig Mautner
785a22188f Merge "Move mLaunchingActivity from stack to supervisor." 2013-07-08 18:46:05 +00:00
Jean-Baptiste Queru
c6376b54ba am a998fa2d: am e14afe71: am 58f26e9d: Merge "The order of child windows is switched"
* commit 'a998fa2df957ad3f1c860d5ab8903041cf53a2f0':
  The order of child windows is switched
2013-07-08 11:27:51 -07:00
Jean-Baptiste Queru
a998fa2df9 am e14afe71: am 58f26e9d: Merge "The order of child windows is switched"
* commit 'e14afe7163a9d25c4d06e40165051f5c2d4d540a':
  The order of child windows is switched
2013-07-08 11:25:44 -07:00
Jean-Baptiste Queru
e14afe7163 am 58f26e9d: Merge "The order of child windows is switched"
* commit '58f26e9dfbd3986037fa5e52e8def1cb6b741bc3':
  The order of child windows is switched
2013-07-08 11:21:52 -07:00
takeda.masayuki
1873509153 The order of child windows is switched
By calling WindowManagerService#reAddWindowLocked(), the window object
in DisplayContent.mWindows is rearranged. If this window has children,
the window objects belonging to WindowState.mChildWindows are also
rearranged together. At this time, while DisplayContent.mWindows is
arranged in ascending order of Z-Order, WindowState.mChildWindows is
arranged in descending order. Therefore, if children
(= WindowState.mChildWindows) are added to DisplayContent.mWindows
in the original order, the order of children is switched. I think
that children must be sorted before they are added.

Change-Id: I28a506f17fcd99c801a3faa17cca66fffb291596
2013-07-08 11:08:41 -07:00
Ying Wang
fb236b56d2 Fix build.
Change-Id: I2348e75e95581b1e5acf1c52b83948e46547a19e
2013-07-08 10:53:58 -07:00
Kenny Root
9a995f57a3 KeySetManager: change KEYSET_NOT_FOUND to public
Make the constant KEYSET_NOT_FOUND so that other source code components
can use that as the sentinel value directly instead of -1

Change-Id: If89de5fb312d55e360b96aadbc6effcd480043b2
2013-07-08 09:37:24 -07:00
Kenny Root
978263ee49 Merge "KeySetManager: add keyset aliases to dump" 2013-07-08 16:23:02 +00:00
Craig Mautner
7ea5bd497f Move mLaunchingActivity from stack to supervisor.
There did not need to be one launching wakelock for each stack.
Moving it to the stack supervisor makes the logic much simpler
and fixes bug 9693439.

Change-Id: I5c9ae856540170a4d66fedb74becb6959c44dd8f
2013-07-05 15:27:08 -07:00
Dianne Hackborn
cee04b5739 Add traces for app launch / fully drawn times.
Note that we don't know the fully drawn time unless the app
tells it has finished drawing, so for apps that don't do this
we will end up just continuing to consider it to be drawing until
the next app is launched.

Change-Id: I766b71cf61b8d7324ccf239b7a44bef2518e2454
2013-07-03 17:06:08 -07:00
Dianne Hackborn
db3c19fd40 Merge "Improve how procstats history/checkins are managed." 2013-07-03 22:50:10 +00:00
Dianne Hackborn
169c8038dd Improve how procstats history/checkins are managed.
We now keep a small set of historic procstats data.  Each
time you reboot a new set of data is created; each day a
new set of data is created.  At most 5 sets of historic data
are kept at a time.  Each checkin only prints any existing
historic data (and deletes it); checkins do not include the
current data, to keep the checkin data less noisy.

This requires a bunch of re-arranging of the way state is
maintained to allow the multiple files, and loading and
processing state from old files.  Also fixed some problems
with writing/reading state.

The checkin format has been tweaked.  There is a new "period"
line that tells you (1) the date/time stamp of the data,
(2) the device realtime data collection started, (3) the
device realtime data collection finished.  The difference
between the last two give you the real time duration for
which the data was collected.

Also, the third field of pkgproc and pkgsvc-*  can now be
abbreviated: if it is the same as the package name, it is
empty; if it is a suffix fo the package name it starts with
'.'.

Change-Id: I422875fccb627d95df7e36c183ac90056f273d83
2013-07-03 15:47:09 -07:00
Kenny Root
df0e6abd9f KeySetManager: add keyset aliases to dump
Add the list of aliases defined to the dumpsys output.

Change-Id: I8bba20fba8dd123f749372cab7b8f038aa47331f
2013-07-03 13:40:16 -07:00
Vinit Deshpande
2120bbb2c7 am 6ea2faf8: am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev
* commit '6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc':
  Revert "Temporarily disable 'Scan Always' mode"
2013-07-03 08:32:32 -07:00
Vinit Deshpande
6ea2faf8ca am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev
* commit '6403663343e6ef1962f0f5e1490d975cbcc653a2':
  Revert "Temporarily disable 'Scan Always' mode"
2013-07-03 08:16:40 -07:00
Vinit Deshpande
c2656a98ce Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev 2013-07-03 00:12:53 +00:00
Vinit Deshpande
218339818c Revert "Temporarily disable 'Scan Always' mode"
This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.

Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
2013-07-03 00:10:53 +00:00
Christopher Tate
18a75f1123 Add dumpsys of recent wakeup patterns, for analysis
Keeps one day of alarm history, and for each one puts a line in dumpsys:
RTC timestamp, millis since previous wakeup alarm, uid, and intent action

Bug 9532215

Change-Id: Ib4fb41aa6291a4cf8f3301bfebf7974e99a9d52c
2013-07-02 15:14:41 -07:00
Wink Saville
e969964c80 am c880ae16: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
* commit 'c880ae16528aa90853952397b8e4d4a299d29c28':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:41:31 -07:00
Wink Saville
c880ae1652 am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:36:47 -07:00
Kenny Root
347403680e Merge "KeySetManager: iterate over correct list" 2013-07-02 19:32:45 +00:00