John Spurlock
71c8a70eff
Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev
2014-09-19 16:04:36 +00:00
Amith Yamasani
0178ecfa43
am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
...
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
Allow primary user profile owner to set device restrictions
2014-09-19 16:02:04 +00:00
Baligh Uddin
ce179a2c5a
am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '45e72ffc04c51bb5c57166e9c3fbd99e0874f3bf':
Import translations. DO NOT MERGE
2014-09-19 15:54:16 +00:00
George Mount
edbffaadf9
am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
...
* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
Fix exception when fragment container has no View.
2014-09-19 15:54:11 +00:00
Chris Craik
f559326b18
Hide other color filter mutability
...
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
2014-09-19 08:54:09 -07:00
George Mount
5abffd26b3
am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev
...
* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
Fix NPE when shared element listener is null.
2014-09-19 15:54:06 +00:00
Amith Yamasani
8d9f121618
Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
2014-09-19 15:51:39 +00:00
John Spurlock
813552cc27
When dozing, re-enable falsing threshold and log events.
...
- Reactivate our configured keyguard falsing swipe threshold
for secure keyguards, but only when dozing.
- Add DozeLog helper to capture/maintain interesting events
about the doze + unlock process, enabled by default, but
only on devices that start dozing at least once.
- Dump summary counts + logged events to dumpsys output.
- Pass notification pulse "instance" as an extra to the scheduled
intent, so we can log accordingly.
Bug:17496795
Change-Id: I7e88f93bfc967bdc06550cf1fe5e74d535edd774
2014-09-19 11:47:30 -04:00
Baligh Uddin
585391803e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-19 15:42:01 +00:00
George Mount
8f8f5f579f
Merge "Fix exception when fragment container has no View." into lmp-dev
2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a
Merge "Fix NPE when shared element listener is null." into lmp-dev
2014-09-19 15:39:03 +00:00
Chris Craik
7f9b493a7f
am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev
...
* commit '969b5ff492aae38fb89c98b2411e217e9b11638e':
Fix garbage showing up beneath dialogs
2014-09-19 15:38:25 +00:00
Chris Craik
651486d018
Merge "Fix garbage showing up beneath dialogs" into lmp-dev
2014-09-19 15:31:18 +00:00
Alan Viverette
0e164aec2c
Delete file containing removed attributes and styles
...
These were already removed from public.xml, so this change does
not affect current.txt or public resource IDs.
BUG: 17577849
Change-Id: I3a754e968732705e5facfbc96e6e14c901d08596
2014-09-19 15:24:30 +00:00
Jessica Hummel
7b6e86f6bc
am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev
...
* commit 'a38239d39e2f71e54352001980863ca81cbbac41':
bug fix: Allow enableSystemApps to be called by profile and device owner.
2014-09-19 14:31:43 +00:00
Jessica Hummel
ccfa1a9799
Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev
2014-09-19 14:22:43 +00:00
Jason Monk
ec81d38d12
QS: Fix accessibility announce for dual tiles
...
Bug: 17512411
Change-Id: I3515804fce2742e9553d65dab9693ccc0b9f39cf
2014-09-19 09:52:47 -04:00
Paul Jensen
713a6ab34a
am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev
...
* commit '2620499ad2dcb2c0891c85ab32f86a5c7823d336':
Fix to make repeated lingerings work.
2014-09-19 12:10:42 +00:00
Paul Jensen
7bfa35742a
Merge "Fix to make repeated lingerings work." into lmp-dev
2014-09-19 11:59:50 +00:00
Jessica Hummel
dd31a10c7f
bug fix: Allow enableSystemApps to be called by profile and device owner.
...
We had an additional check for managed profile in there, so it wasn't working for device owners. Also needed to look at uninstalled packages.
Change-Id: I4813f23b00d7905e92ade582ce082a6f295a322d
Bug: 17384318
2014-09-19 09:56:19 +00:00
Kenny Guy
7fd10053bb
am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev
...
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
Remove suggested key names as its confusing.
2014-09-19 09:55:33 +00:00
Kenny Guy
52ee328054
Merge "Remove suggested key names as its confusing." into lmp-dev
2014-09-19 09:44:23 +00:00
Christoph Studer
365e4c38d5
Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
...
When services call Service.stopForeground(), remove
FLAG_FOREGROUND_SERVICE from the notification that was supplied
to Service.startForeground().
This enables services to post notifications that become user
dismissable when they switch to being a background service.
Restrict this to targetSdk=L apps to reduce the risk of breaking
existing apps.
Bug: 17551106
Change-Id: Iff8541e5bb2a23ad1fbc9ad80df5fd6eb683148b
2014-09-19 09:53:12 +02:00
Yohei Yukawa
3ddb821311
am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev
...
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
Speculative fix of IMMS crash
2014-09-19 05:28:56 +00:00
Yohei Yukawa
d66a7324cc
Merge "Speculative fix of IMMS crash" into lmp-dev
2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190
Speculative fix of IMMS crash
...
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.
Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().
BUG: 17553712
BUG: 17549437
BUG: 17517332
Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
2014-09-19 05:02:59 +00:00
Dan Sandler
a7b1259754
am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev
...
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
Fix LayoutInflater copy constructor logic.
2014-09-19 03:45:03 +00:00
Dan Sandler
20d01ad8a1
Merge "Fix LayoutInflater copy constructor logic." into lmp-dev
2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03
Fix LayoutInflater copy constructor logic.
...
Avoids an NPE in mFilterMap.
Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
2014-09-18 22:23:32 -04:00
Dianne Hackborn
01793ca79c
am 31ce4c62: Merge "Fix issue #17564607 : Apps in the managed profile can send any intent..." into lmp-dev
...
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
Fix issue #17564607 : Apps in the managed profile can send any intent...
2014-09-19 02:10:14 +00:00
Mike Lockwood
652bf9c9d8
am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
...
* commit '52e5e3599151c01a8107f08238ce1c59d8ec2fe1':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
2014-09-19 02:10:08 +00:00
Dianne Hackborn
aad42d1204
Merge "Fix issue #17564607 : Apps in the managed profile can send any intent..." into lmp-dev
2014-09-19 02:01:58 +00:00
Dianne Hackborn
ace27915d2
Fix issue #17564607 : Apps in the managed profile can send any intent...
...
...to the primary user, even if it was not whitelisted to be forwarded.
The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.
Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
2014-09-18 19:01:01 -07:00
Mike Lockwood
51938c205f
Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
2014-09-19 02:00:26 +00:00
Michael Wright
8ebac23196
Respect intent-filter priority for system keyboard layouts.
...
Bug: 17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
2014-09-18 18:48:19 -07:00
w19976
6f006cce75
Handling service number convert while roaming.
...
When roaming, change *611 to +19085594899.
Bug: 17202092
Change-Id: Ibd130911131e9ed245cca7130853176f831e361e
2014-09-19 01:36:15 +00:00
Alan Viverette
b4a7bcc52e
am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev
...
* commit 'd03ba30bac5d250cdc7d43102dd06af2f114d7a8':
Always apply window insets to action modes
2014-09-19 01:29:15 +00:00
Amit Mahajan
700dee04c7
am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev
...
* commit '010bdd3c2f68e01ba244baf036b2e952afb99bbf':
Fix voice mail number to modify when insert H3G Denmark sim card.
2014-09-19 01:29:11 +00:00
Adam Powell
594558d7e9
Make panel menu windows respect elevation
...
Bug 17430536
Change-Id: I962dfa10d3cb4f735dcaa68f17e7ff278d1580a2
2014-09-18 18:22:29 -07:00
Alan Viverette
3540c462d9
Merge "Always apply window insets to action modes" into lmp-dev
2014-09-19 01:16:22 +00:00
Yigit Boyar
22f0f4a956
am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev
...
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
Fix scroll position calculation when clipToPadding is false
2014-09-19 01:12:21 +00:00
Amit Mahajan
0297ad884d
Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev
2014-09-19 01:07:23 +00:00
Yigit Boyar
91803838c8
Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev
2014-09-19 00:59:53 +00:00
giseok.seo
b907867f68
Fix voice mail number to modify when insert H3G Denmark sim card.
...
1.H3G Denmark SIM Card is set to "not available" in UST(Usim service Table) to
EF_MBDN file of SIM CARD.
so do not edit voicemail number.
2.AOSP default voicemail number is empty.
so if inserted H3G Denmark SIM card, User cann't edit voicemail number and
do not use voicemail service.
Bug: 14093735
Change-Id: I2469ef8e8bda376adcdc9549bf4227bc4c0ddb2e
2014-09-19 00:59:12 +00:00
Winson Chung
cbbaf10d44
am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev
...
* commit '767df884f10be4ad3b7a3e5ae8b97e4ef817e792':
Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
2014-09-19 00:06:20 +00:00
Winson Chung
c751284910
am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
...
* commit '5c744b1b01156c37f894619fbe70741435d7ed53':
Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
2014-09-19 00:06:16 +00:00
Winson Chung
56eef1c5c6
Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev
2014-09-18 23:50:38 +00:00
Winson Chung
f7dd908171
Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
2014-09-18 23:50:32 +00:00
Yigit Boyar
40c6c555e9
Fix scroll position calculation when clipToPadding is false
...
Bug: 17568582
Change-Id: I904450d62c93105db5c61a071c7816278bb441be
2014-09-18 16:31:52 -07:00
Craig Mautner
2fb474483b
am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev
...
* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
Don't count finishing activities as effective activities.
2014-09-18 23:19:58 +00:00