7899 Commits

Author SHA1 Message Date
Wink Saville
4ee594e305 am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
2014-03-07 02:30:08 +00:00
Dianne Hackborn
c1349a9601 am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '4ad93639d210297764db3ffcd870ff38464943de':
  Runtime resource overlay, iteration 2
2014-03-07 02:27:10 +00:00
Santos Cordon
ff96593ede am abbd963e: am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
2014-03-06 20:05:23 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
2014-03-06 19:49:46 +00:00
Santos Cordon
4c8c27ed73 Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
2014-03-06 17:27:59 +00:00
Baligh Uddin
221849b6d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-06 17:00:46 +00:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
2014-03-06 00:56:59 +00:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
2014-03-06 00:53:22 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Dirk Dougherty
f55616cd8b Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)
2014-03-05 23:21:41 +00:00
Baligh Uddin
8c0dff620a Import translations. DO NOT MERGE
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
2014-03-05 09:58:27 -08:00
Yorke Lee
6c758e8650 am 468e973f: am 81479358: Reword the "Quick contacts not available" string
* commit '468e973f52d09a5e724c9ccb545ec08c49991506':
  Reword the "Quick contacts not available" string
2014-03-04 04:12:06 +00:00
Yorke Lee
468e973f52 am 81479358: Reword the "Quick contacts not available" string
* commit '81479358decb0a2cefbb8245e0f56ed0e966d697':
  Reword the "Quick contacts not available" string
2014-03-04 04:09:04 +00:00
Yorke Lee
81479358de Reword the "Quick contacts not available" string
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)
2014-03-04 02:50:21 +00:00
Dirk Dougherty
95cf532fe3 am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs
* commit '26de0b7118e188bac5a30d9562418fa09be3826a':
  Update permission description string.
2014-03-03 22:18:04 +00:00
Dirk Dougherty
26de0b7118 am cce121fb: Merge "Update permission description string." into klp-docs
* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.
2014-03-03 22:13:31 +00:00
Dirk Dougherty
08d7c2861f Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
2014-03-03 14:05:21 -08:00
Jay Shrauner
7e3efa82ec am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 22:02:14 +00:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00
rich cannings
fd6d8a8b73 am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
* commit 'bc4d34dd8e5cfdccede6aefb163fe2283785c5b0':
  Make FORCE_STOP_PACKAGES "signature|system"
2014-03-03 17:24:59 +00:00
rich cannings
bc4d34dd8e am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"
2014-03-03 17:21:58 +00:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
2014-03-01 18:07:22 +00:00
Michael Wright
bdffc3ad05 Revert Japanese special case fallback keys.
Reverts commits 4567e40eb04589d211af82f2dcb16cb3955c605e and
a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
for game controllers in the Japanese locale.

Bug: 12923922
Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
2014-02-26 15:43:48 -08:00
rich cannings
0c9bd3ed4d Make FORCE_STOP_PACKAGES "signature|system"
Bug: 12992556
Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
(cherry picked from commit 4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)
2014-02-24 21:00:58 +00:00
Baligh Uddin
b3425a65aa Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
2014-02-19 19:42:43 -08:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Mårten Kongstad
48d22323ce Runtime resource overlay, iteration 2
Support any number of overlay packages. Support any target package.

UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes

    <overlay targetPackage="com.target.package"/>

For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.

THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').

UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.

Zygote initialization
   Initial AssetManager object created
+    idmap --scan creates idmaps for overlays targeting 'android', \
           stores list of overlays in /data/resource-cache/overlays.list
   AssetManager caches framework-res.apk
+  AssetManager caches overlay packages listed in overlays.list

Android boot
   New AssetManager's ResTable acquired
     AssetManager re-uses cached framework-res.apk
+    AssetManager re-uses cached 'android' overlays (if any)

App boot
   ActivityThread prepares AssetManager to load app.apk
+  ActivityThread prepares AssetManager to load app overlays (if any)
   New AssetManager's ResTable acquired as per Android boot

SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.

LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.

When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.

Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:

    <overlay targetPackage="com.target.package" priority="1234"/>

Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.

Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.

The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.

        +------+------+-     -+------+------+
        | 0x01 |      |  ...  |      | 0x7f |
        +------+------+-     -+------+------+
            |                           |
        "android"                Target package A
                                        |
                       Pre-installed overlay B (priority 1)
                                        |
                       Pre-installed overlay C (priority 2)

Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
2014-02-03 11:20:30 +01:00
Wink Saville
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 08:49:09 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Antonio Marín Cerezuela
c5ac15a3e1 Telephony API extension v2
Added new AndroidManifest permission:

android.permission.READ_PRECISE_PHONE_STATE

Added the following PhoneStateListeners and corresponding broadcast intents:

onPreciseCallStateChanged(PreciseCallState callState);
onPreciseDataConnectionStateChanged(PreciseDataConnectionState dataConnectionState);

broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, int backgroundCallState,
	int disconnectCause, int preciseDisconnectCause)
broadcastPreciseDataConnectionStateChanged(int state, int networkType, String apnType, String apn,
	String reason, LinkProperties linkProperties, String failCause)

Added TelephonyManager intent actions with their extras and constants:

public static final String ACTION_PRECISE_CALL_STATE_CHANGED = "android.intent.action.PRECISE_CALL_STATE";
public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED";

public static final int PRECISE_CALL_STATE_*

Moved public static final int DISCONNECT_CAUSE_* from PreciseCallState.java to a new class DisconnectCause.java

Moved public static final int PRECISE_DISCONNECT_CAUSE_* from PreciseCallState.java to a new class PreciseDisconnectCause.java

Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
2014-01-10 11:08:06 +01:00
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:31:02 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Rakesh Pallerla
b8b7bd3185 Telephony: Modify code to check that PUK code length is always 8.
As per 3GPP TS 31.101 Release 11 section 9.6, the number of digits
for UNBLOCK PIN (PUK) is always 8.

Change-Id: I4ea69fd8e2e8e96330d10a67b2d1f5a1859c1016
2014-01-08 19:46:25 +05:30
Robert Greenwalt
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-07 16:44:30 -08:00
Baligh Uddin
6e15a49eee Import translations. DO NOT MERGE
Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
Auto-generated-cl: translation import
2014-01-06 12:16:37 -08:00
Baligh Uddin
2ae0419fb1 Import translations. DO NOT MERGE
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
2013-12-30 09:30:42 -08:00
Baligh Uddin
8677794bfa Import translations. DO NOT MERGE
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
2013-12-26 10:16:09 -08:00
Baligh Uddin
3cc579ebac Import translations. DO NOT MERGE
Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
Auto-generated-cl: translation import
2013-12-18 15:37:22 -08:00
Sungmin Choi
74435010c4 Revert "Do not show roaming icon for Videotron operator when access Canada network"
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2013-12-16 07:46:07 +00:00
Sungmin Choi
054379313d telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2013-12-16 09:18:13 +09:00
Baligh Uddin
0bfbb67627 Import translations. DO NOT MERGE
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
2013-12-09 09:53:12 -08:00
Geoff Mendal
6d25c934dc Import translations. DO NOT MERGE
Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
Auto-generated-cl: translation import
2013-12-04 11:35:25 -08:00
Geoff Mendal
8d49b29d81 Import translations. DO NOT MERGE
Change-Id: Ifb196b0f76843e5488d4a387ed4f7add07e84ecd
Auto-generated-cl: translation import
2013-12-02 10:21:45 -08:00
Geoff Mendal
99dcfed6e9 Import translations. DO NOT MERGE
Change-Id: Icd558c400a77f1e2b72e7279e33c56aa96398a1e
Auto-generated-cl: translation import
2013-11-27 10:20:55 -08:00
Geoff Mendal
7a4adedf0a Import translations. DO NOT MERGE
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
2013-11-25 09:42:45 -08:00
Geoff Mendal
35f097a7bf Import translations. DO NOT MERGE
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
2013-11-21 10:42:03 -08:00
Jeff Brown
f508c2b0fb am d2a0192b: am b40ce4b8: Make action bar media router icons blue again.
* commit 'd2a0192bf237994f0132625fc00d21896912151e':
  Make action bar media router icons blue again.
2013-11-20 16:51:07 -08:00
Jeff Brown
d2a0192bf2 am b40ce4b8: Make action bar media router icons blue again.
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.
2013-11-20 16:48:52 -08:00