Commit Graph

41617 Commits

Author SHA1 Message Date
Matthew Xie
67cc127186 am e7e6bf9f: am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit 'e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
  Revert "Change GATT_FAILURE from 0 to 0x101"
2013-05-28 13:50:13 -07:00
Matthew Xie
d78afea78d am 84e1afcc: am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '84e1afcccc328e7a52bfde16e824a3ed37889d1d':
  Change GATT_FAILURE from 0 to 0x101
2013-05-28 13:50:09 -07:00
Dianne Hackborn
aa508bc6db am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
  Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-28 13:50:02 -07:00
Dianne Hackborn
bbf6ecc981 am 4e73e8a8: am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '4e73e8a817ff99a19ba9ed6fa68754007731406d':
  Fix CalendarView to show the month title properly.
2013-05-28 13:49:59 -07:00
Dianne Hackborn
f8b8521598 am 89eed125: am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit '89eed125590c6286fa64e9074e95196c8cc4bd27':
  Don't include flags in configuration change if their value hasn't changed.
2013-05-28 13:49:56 -07:00
Dianne Hackborn
56798adf41 am 959b9b39: am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '959b9b39b4e488b643919fb7a58f2fbbdd70e573':
  Fix documentation of requestCode parameter.
2013-05-28 13:49:53 -07:00
John Spurlock
0efd4f0215 Merge "Fix typo in View.java javadocs" 2013-05-28 15:45:18 +00:00
John Spurlock
9643d40395 Fix typo in View.java javadocs
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
2013-05-28 09:44:50 -04:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101"
This reverts commit 8310e6196f

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
Dianne Hackborn
23b07d5549 am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '43861f9de965593340f6a63c270120a7f1a8701c':
  Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-26 00:05:08 -07:00
Dianne Hackborn
4e73e8a817 am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '95b79966934864f1e81329de92562ee387ff5700':
  Fix CalendarView to show the month title properly.
2013-05-26 00:05:05 -07:00
Dianne Hackborn
89eed12559 am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'c73220050efa7420974850ee9a80a965d807c7ce':
  Don't include flags in configuration change if their value hasn't changed.
2013-05-26 00:05:02 -07:00
Dianne Hackborn
959b9b39b4 am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit 'fc09b326da5e35786530777f01cd132d7686a788':
  Fix documentation of requestCode parameter.
2013-05-26 00:04:59 -07:00
Dianne Hackborn
43861f9de9 am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-26 00:02:46 -07:00
Dianne Hackborn
95b7996693 am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '0a40bef955c937189841b6f1695e8001311758fa':
  Fix CalendarView to show the month title properly.
2013-05-26 00:02:41 -07:00
Dianne Hackborn
c73220050e am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.
2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da am fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.
2013-05-26 00:02:31 -07:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Scott Main
69d692dca9 am 79c53809: am 4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
* commit '79c538094b99330bd2af37d1f486220643b27e42':
  add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
2013-05-24 18:20:41 -07:00
Scott Main
79c538094b am 4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
* commit '4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
  add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
2013-05-24 18:18:33 -07:00
Scott Main
4a47f17a9d Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 2013-05-25 01:17:06 +00:00
Dianne Hackborn
2e39f5c5cb Merge "New ArrayMap class." 2013-05-24 23:37:16 +00:00
Dianne Hackborn
f4bf0ae2a7 New ArrayMap class.
This is a new kind of key/value mapping that stores its data
as an array, so it doesn't need to create an extra Entry object
for every mapping placed in to it.  It is also optimized to reduce
memory overhead in other ways, by keeping the base object small,
being fairly aggressive about keeping the array data structures
small, etc.

There are some unit and performance tests dropped in to some
random places; they will need to be put somewhere else once I
decided what we are going to do with this for the next release
(for example if we make it public the unit tests should go in
to CTS).

Switch IntentResolver to using ArrayMap instead of HashMap.

Also get rid of a bunch of duplicate implementations of binarySearch,
and add an optimization to the various sparse arrays where you can
supply an explicit 0 capacity to prevent it from doing an initial
array allocation; use this new optimization in a few places where it
makes sense.

Change-Id: I01ef2764680f8ae49938e2a2ed40dc01606a056b
2013-05-24 16:36:14 -07:00
Craig Mautner
18f8530486 Merge "Convert API refs to StackBox from ActivityStack." 2013-05-24 23:14:52 +00:00
Craig Mautner
5a449154d1 Convert API refs to StackBox from ActivityStack.
- Removed IActivityManager.getStacks() since getStackBoxes() is better.
- Made createStacks operate relative to StackBox instead of TaskStack.
- Made resizeStack into resizeStackBox.

Change-Id: I7a0e1f4e34f399b4fd1180c60cc3989f9c2433f3
2013-05-24 16:12:57 -07:00
Scott Main
4f057ffa2a am c8516380: am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev
* commit 'c8516380924863f181e3ad66c1069f1da9c52f11':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
2013-05-24 14:45:33 -07:00
Scott Main
c851638092 am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev
* commit 'eebec7b1fe68cef9c4feed1f56af2592b402a629':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
2013-05-24 14:42:58 -07:00
Scott Main
eebec7b1fe Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 2013-05-24 21:40:45 +00:00
Scott Main
509267d618 add links to orientation flags in attribute docs
to help determine the supported API level for each value
and update the manifest reference page with new attributes

Change-Id: I583a9b3f3be759be71044533055dec26e3616b72
2013-05-24 14:32:14 -07:00
Alan Viverette
4026a797bc am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev
* commit '14ccf554d0168d94c35c058b057d7d1aca228c6e':
  DO NOT MERGE. Fix number picker accessibility focus.
2013-05-24 14:21:55 -07:00
Alan Viverette
14ccf554d0 Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 2013-05-24 21:19:55 +00:00
Tim Murray
df6f42394b Merge "Add support to Java for RS tracing." 2013-05-24 21:06:40 +00:00
Michael Wright
4759c35e42 am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
* commit 'bf0d561c73abd97a1a3794e9aa62b21911279a12':
  Pipe through bounding box information (DO NOT MERGE)
2013-05-24 13:53:47 -07:00
Tim Murray
6d7a53cbdd Add support to Java for RS tracing.
Change-Id: I95c365345fea3a1e132a7eb2270d541be0745d02
2013-05-24 13:36:32 -07:00
Robert Greenwalt
32190aca1c am e70b8d70: am 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators"
* commit 'e70b8d70029c0fb9370186ee9da425caf0e998ef':
  Update tethering profile for specific operators
2013-05-24 13:02:08 -07:00
Craig Mautner
8cec2bcef9 Merge "Add retrieval of StackBox info for more flexibility" 2013-05-24 19:54:18 +00:00
Craig Mautner
5ff1210172 Add retrieval of StackBox info for more flexibility
First step in permitting StackBoxes to be manipulated by user.
Necessary for Configuration changes coming down.

Change-Id: I4029926a35e4fdc59a5759fd9e4bae10bb308413
2013-05-24 12:50:15 -07:00
Robert Greenwalt
e70b8d7002 am 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators"
* commit '46fa10b1a0a67e1937c9e696d1fd786162dcfb8e':
  Update tethering profile for specific operators
2013-05-24 11:03:45 -07:00
Robert Greenwalt
46fa10b1a0 am 1d8c5b5b: Merge "Update tethering profile for specific operators"
* commit '1d8c5b5b1df96004d6c6e0d056f0c3707461a01a':
  Update tethering profile for specific operators
2013-05-24 11:01:28 -07:00
Dianne Hackborn
64770d16b0 Some improvements to meminfo output.
- Rename "Swappable PSS" to "PSS Clean" which I think is what it
  means and is consistent with the other memory metrics.
- Split at the top level the dalvik heap from other dalvik allocations,
  so when you look on the dalvik allocations line things are consistent
  with the allocator's data and it is clear what are app allocations vs.
  other data in dalvik.
- Don't print lines that are all 0.
- Don't print the detailed Dalvik allocation data by default; add a new
  option to have it printed.

Here's what a typical system process dump now looks like:

** MEMINFO in pid 6358 [system] **
                   Pss      Pss   Shared  Private   Shared  Private     Heap     Heap     Heap
                 Total    Clean    Dirty    Dirty    Clean    Clean     Size    Alloc     Free
                ------   ------   ------   ------   ------   ------   ------   ------   ------
  Native Heap        0        0        0        0        0        0     6964     3599     2048
  Dalvik Heap     7541        0     4344     7356        0        0    11768    11194      574
 Dalvik Other     3553        0     2792     3448        0        0
        Stack       28        0        8       28        0        0
       Cursor        4        0        0        4        0        0
       Ashmem        5        0       12        0        0        0
    Other dev     4004        0       24     4000        0        4
     .so mmap     3959      684     2500     2280     5468      684
    .apk mmap      173       68        0        0      692       68
    .dex mmap     4358     3068        0        0     9276     3068
   Other mmap       60        0        8        8      244       36
      Unknown     4387        0      508     4380        0        0
        TOTAL    28072     3820    10196    21504    15680     3860    18732    14793     2622

 Objects
               Views:       10         ViewRootImpl:        1
         AppContexts:        8           Activities:        0
              Assets:        3        AssetManagers:        3
       Local Binders:      176        Proxy Binders:      341
    Death Recipients:      141
     OpenSSL Sockets:        0

 SQL
         MEMORY_USED:      473
  PAGECACHE_OVERFLOW:       98          MALLOC_SIZE:       62

 DATABASES
      pgsz     dbsz   Lookaside(b)          cache  Dbname
         4       68             49         7/21/7  /data/data/com.android.providers.settings/databases/settings.db
         4       20             17         0/13/1  /data/system/locksettings.db
         4       20             21        96/14/2  /data/system/locksettings.db (1)
         4       20             21        75/13/2  /data/system/locksettings.db (2)
         4       80             29         4/17/3  /data/system/users/0/accounts.db

Change-Id: Ifd511a7baaa8808f82f39509a5a15c71c41d1bac
2013-05-24 10:47:03 -07:00
seonju.oh
8645031246 Update tethering profile for specific operators
Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
2013-05-24 10:33:11 -07:00
Alan Viverette
dbed27e5e4 DO NOT MERGE. Fix number picker accessibility focus.
The node bounds populated by the child TextView were not consistent
with the bounds manually populated for its parent NumberPicker.

Bug: 9072003
Change-Id: Icbfa64f52cf11fd39c7243936227b8ba36280c3c
2013-05-24 10:03:24 -07:00
Matthew Xie
8310e6196f Change GATT_FAILURE from 0 to 0x101
GATT_FAILURE 0 clashes with GATT_SUCCESS. For now, they represent different
kind of faiure. One for Gatt operation, one for Gatt registration. But we
should separate them as good practice.
bug 9109238

Change-Id: I686bb6004bc8831aa3e3bbffe2f7c8e24412e3c3
2013-05-23 17:39:35 -07:00