Mikhail Naganov
6940b66409
Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
Bug: 13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
2014-05-08 10:10:24 +01:00
Deepanshu Gupta
5ba2f230fa
Add view cookies for action bar menus. [DO NOT MERGE]
...
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)
2014-04-23 18:04:21 -07:00
Kenny Root
cf677a37fb
am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'e00c9185262c675f1680920c258413299995042a':
Use hidden API to validate APK chains
2014-04-18 23:00:37 +00:00
Kenny Root
e00c918526
am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
Use hidden API to validate APK chains
2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f
am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598
am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929
am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
2014-04-18 22:37:38 +00:00
Kenny Root
2ed5f771c4
am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
2014-04-18 22:31:08 +00:00
Kenny Root
4a62a6dce9
am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
2014-04-18 22:14:14 +00:00
Kenny Root
451ed5f077
am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
2014-04-18 21:33:04 +00:00
Kenny Root
3ecaa88d83
am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
2014-04-18 18:14:32 +00:00
Kenny Root
ecb013dbff
Merge "Use hidden API to validate APK chains" into jb-dev
2014-04-18 17:12:40 +00:00
Kenny Root
16c6b177ee
Use hidden API to validate APK chains
...
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
2014-04-17 14:03:33 -07:00
Vinit Deshapnde
45e7467666
Merge "Don't reset country code once it is persisted" into klp-dev
2014-04-17 18:54:58 +00:00
Vinit Deshapnde
b5ee95edf9
Don't reset country code once it is persisted
...
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
2014-04-17 11:05:21 -07:00
Deepanshu Gupta
f1e7187645
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)
Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
2014-04-15 20:03:19 -07:00
Deepanshu Gupta
4ccc4bd54f
Action bar rendering in layoutlib [DO NOT MERGE]
...
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 14bf0cef7eeed572a67c29a328581afac4decc20)
2014-04-15 20:02:48 -07:00
Robert Greenwalt
128e937108
am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:00:33 +00:00
Robert Greenwalt
106627e07c
am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit 'e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:54:13 +00:00
Robert Greenwalt
f52d1a56af
am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
...
* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:54 +00:00
Robert Greenwalt
74acf23a1e
am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:44 +00:00
Baligh Uddin
ca0513026a
Import translations. DO NOT MERGE
...
Change-Id: I3ba9a4dc3048b098598e12a78e7cc7dde521ea56
Auto-generated-cl: translation import
2014-04-02 08:41:45 -07:00
Baligh Uddin
dc5e02bdcc
Import translations. DO NOT MERGE
...
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
2014-03-31 11:34:59 -07:00
Robert Greenwalt
e1549ae364
DO NOT MERGE Sanitize WifiConfigs
...
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
2014-03-28 14:54:53 -07:00
Robert Greenwalt
fe38ff8d36
DO NOT MERGE Sanitize WifiConfigs
...
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
2014-03-28 11:38:33 -07:00
Jeff Sharkey
0bc7cea6aa
Enlarge space allowed for internal downloads.
...
Bug: 13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
2014-03-27 18:16:32 -07:00
Baligh Uddin
9ac253ffed
Import translations. DO NOT MERGE
...
Change-Id: I9e363ec3f4253e6496f1c6cc6019bb807388e7f4
Auto-generated-cl: translation import
2014-03-26 11:06:02 -07:00
Eino-Ville Talvala
ecad0541a6
Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
2014-03-25 18:57:08 +00:00
Baligh Uddin
077587fb50
Import translations. DO NOT MERGE
...
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
2014-03-24 09:46:08 -07:00
Gabriel Peal
83da75d938
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
...
The first set of these APIs is for telephony:
Added some APIs to ITelephony and created a first party framework for them
toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)
Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
2014-03-22 13:33:43 -07:00
Igor Murashkin
965bed1c2c
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
...
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
2014-03-22 01:36:54 +00:00
Chad Brubaker
de4e7b4947
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
2014-03-21 20:52:05 +00:00
Unsuk Jung
1a70f39160
Merge "Change wallpaper sizing" into klp-dev
2014-03-21 19:01:08 +00:00
Jeff Sharkey
3f5232220f
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
2014-03-21 17:47:00 +00:00
Michael Jurka
3368a63c64
Change wallpaper sizing
...
Bug: 11997581
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary
Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
2014-03-21 10:29:27 +00:00
Adam Powell
4932530590
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
2014-03-21 00:19:12 +00:00
Vinit Deshapnde
52bc363cf3
Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
2014-03-20 19:26:44 +00:00
Baligh Uddin
d16505da86
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-03-20 18:32:35 +00:00
Adam Powell
f503a2d47f
Update contextual asset bar assets to avoid 9-patch artifacts
...
Asset drop from UX
Bug 11879853
Change-Id: I8190340900a16ae41135ec1231e36e959603e165
2014-03-20 09:32:11 -07:00
Wei Wang
c0384b6b18
DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050
...
Cherrypick from master to fix b/13289050
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
2014-03-19 20:31:36 -07:00
Wei Wang
4b4eebb9a5
DO NOT MERGE: Add status callback for start/stop advertising.
...
Cherrypick from master to fix b/13289050
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
2014-03-20 00:33:41 +00:00
Victoria Lease
610d401cb5
am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
malloc some advances
2014-03-19 22:27:06 +00:00
Victoria Lease
e9c7fd2f2e
am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '55371beb024ae402831898f8788e4293f52dd832':
malloc some advances
2014-03-19 15:21:09 -07:00
Victoria Lease
55371beb02
am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
malloc some advances
2014-03-19 15:14:07 -07:00
Victoria Lease
754bf6abc0
am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
malloc some advances
2014-03-19 15:08:32 -07:00
Vinit Deshapnde
45b97c2c99
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
...
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.
BUG: 11062898
Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
2014-03-19 15:04:49 -07:00
Victoria Lease
c8868db2a0
am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
malloc some advances
2014-03-19 15:03:28 -07:00
Victoria Lease
737d3e5da3
am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
malloc some advances
2014-03-19 14:57:36 -07:00
Victoria Lease
3191212259
am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
2014-03-19 14:40:17 -07:00
Victoria Lease
6eb2810318
am 183f97b7: am 1c12f9e7: malloc some advances
...
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
2014-03-19 14:32:15 -07:00