drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
183,378 Commits 1 Branch 0 Tags
Commit Graph

183378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
4c74da90db am c74295db: am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit 'c74295db3048d964679913f146511ce3ad838089':
  Add status bar time for 5.1
 2015-03-02 22:45:57 +00:00
James Cook
c1bce3de90 Merge "Fix crash in UndoManager after parceling TextView" 2015-03-02 22:43:51 +00:00
Alan Viverette
445e1c5ddd Merge "Improve handling of activity destroy during popup exit animation" 2015-03-02 22:24:25 +00:00
Adam Lesinski
f55187767e Merge "Fix issue where pruned UsageStats files would not be removed from index" 2015-03-02 22:23:44 +00:00
Adam Lesinski
a4005662c7 Merge "Add generic "INTERACTION" event type to UsageStatsManager" 2015-03-02 22:22:58 +00:00
James Cook
f143ace3aa Fix crash in UndoManager after parceling TextView 
UndoOwner maintains a manual reference count of the number of undo operations
it is associated with, but this count is not restored (and hence becomes zero)
when UndoManager is parceled and unparceled. This can cause the count to
underflow on subsequent text editing.

A test for this will land separately in CTS.

Bug: 19568283
Change-Id: Ic50890828db9679c7cef805388957d66dc75422d
 2015-03-02 13:27:51 -08:00
Adam Lesinski
3a0831bfe6 Fix issue where pruned UsageStats files would not be removed from index 
This would cause an exception to be thrown when querying stats
that included a deleted file and cause only in-memory stats to be
returned.

This change now re-indexes after deleting files.

Furthermore, we continue reading UsageStats files in order
to return more useful data if some other issue (file corruption)
leads us to fail reading a file.

Change-Id: I4a52739624d68e719e3d7d324a0b16709a62ac7a
 2015-03-02 13:06:46 -08:00
Adam Lesinski
978a1ed5aa Add generic "INTERACTION" event type to UsageStatsManager 
This will allow for updating a package's last time used
property for packages that are interacted in ways other than
launching their activities (interacting with notifications, etc.)

Change-Id: Ic6f9519f46fa04abd37ea6fc9475bcd9ea721003
 2015-03-02 12:54:14 -08:00
John Spurlock
7b91c55b3f Merge "Remove unused imports in frameworks/base." 2015-03-02 20:43:50 +00:00
Alan Viverette
df4639a013 Improve handling of activity destroy during popup exit animation 
Ensures the decor view isn't double-removed and that we don't try to
dereference a null anchor view.

Bug: 19553353
Bug: 19551371
Change-Id: I191a41f9065b68e49d66f96794cb7456f79d2d34
 2015-03-02 12:40:34 -08:00
leozwang
3aa50cb275 Merge "Remove PROPERTY_SIM_COUNT and "ro.telephony.sim.count"" 2015-03-02 20:13:17 +00:00
John Spurlock
4b69ac70a1 Merge "AudioService: Migrate index map to SparseIntArray." 2015-03-02 20:07:04 +00:00
Deepanshu Gupta
c74295db30 am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit 'bf815f495270b466e53bec20772b41ff4397ac83':
  Add status bar time for 5.1
 2015-03-02 19:53:32 +00:00
Deepanshu Gupta
bf815f4952 am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit '7b4caab1a87b659498d30af194ae511526c503ba':
  Add status bar time for 5.1
 2015-03-02 19:47:29 +00:00
Deepanshu Gupta
7b4caab1a8 am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit '07d453fa091ab407864d474f9bf2a5167686010a':
  Add status bar time for 5.1
 2015-03-02 19:41:59 +00:00
Deepanshu Gupta
07d453fa09 Merge "Add status bar time for 5.1" into lmp-mr1-dev 2015-03-02 19:26:15 +00:00
Fyodor Kupolov
8a9588ed95 Merge "Increased char limit for policylab_expirePassword" 2015-03-02 19:14:08 +00:00
Fyodor Kupolov
ea1bf1c7b2 Increased char limit for policylab_expirePassword 
Bug: 19538249
Change-Id: Ia5209d7df5c2b810776a37ae805f96c643ab6ae4
 2015-03-02 11:07:56 -08:00
Joe Fernandez
6171f72634 am ad87503e: am 98a57a1a: am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit 'ad87503ed083245c9ccf51cee0f88aecd3531bb4':
  docs: March 2015 Dashboard update
 2015-03-02 18:34:24 +00:00
Joe Fernandez
ad87503ed0 am 98a57a1a: am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '98a57a1ab8da73f6b328082f31c6c6732108cf2b':
  docs: March 2015 Dashboard update
 2015-03-02 18:26:56 +00:00
Winson Chung
0e1f9b91f1 Merge "Force single stack id workaround. (Bug 19560619)" 2015-03-02 18:24:09 +00:00
Winson Chung
955ac2237d Force single stack id workaround. (Bug 19560619) 
Change-Id: Ia3cbe0ca75b018bf499a814f37d8a532d52981f1
 2015-03-02 10:20:37 -08:00
Joe Fernandez
98a57a1ab8 am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '4725bec1ff03d8be859c52dba6ac663016c2295c':
  docs: March 2015 Dashboard update
 2015-03-02 18:18:46 +00:00
John Spurlock
2bb02ec6a9 AudioService: Migrate index map to SparseIntArray. 
- Use SparseIntArray instead of a generic hash map.
 - Avoids unnecessary boxing/unboxing.
 - Avoids unnecessary allocation for iterator temp objects.
 - Provides deterministic dumping (by ascending device order).

Change-Id: If5ca5edd94af90cfed65ecbbbc1f4929f50ab6e9
 2015-03-02 13:13:06 -05:00
Joe Fernandez
4725bec1ff am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '8243b74f7f19d57455f7ff9188f539d0361139db':
  docs: March 2015 Dashboard update
 2015-03-02 18:10:54 +00:00
Amith Yamasani
d65ed88144 Merge "Avoid NPE when quickly toggling USB debugging state" 2015-03-02 18:07:58 +00:00
Joe Fernandez
8243b74f7f am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
  docs: March 2015 Dashboard update
 2015-03-02 18:04:39 +00:00
Chris Craik
53e5266990 Merge "Cleanup of FontRenderer" 2015-03-02 17:49:00 +00:00
leozwang
5e02fa95f7 Remove PROPERTY_SIM_COUNT and "ro.telephony.sim.count" 
These two defines are not being used anywhere.

Change-Id: Ie08468b8be18bf1860627e644bbd984bd1c899f4
 2015-03-02 09:23:44 -08:00
Joe Fernandez
6a0c808487 am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
  docs: March 2015 Dashboard update
 2015-03-02 17:14:51 +00:00
Amith Yamasani
f6197e8fa2 Avoid NPE when quickly toggling USB debugging state 
If you try to disable USB debugging before the socket
to listen is opened in the thread, it will end up
with an NPE.

Do some locking around socket creation and closing
to avoid this.

Bug: 18708503
Change-Id: Iac43e4806fff1e411772b1ba1a070d8a7c776fcb
 2015-03-02 09:14:23 -08:00
Joe Fernandez
9b94a53998 am 97a1173b: docs: March 2015 Dashboard update 
* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update
 2015-03-02 17:09:01 +00:00
John Spurlock
1f92c9f6bc Merge "AudioService: Fix typo in constant." 2015-03-02 17:04:49 +00:00
Joe Fernandez
97a1173b63 docs: March 2015 Dashboard update 
Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
 2015-03-02 09:00:55 -08:00
John Spurlock
59dc9c1d19 AudioService: Fix typo in constant. 
Change-Id: I66dba8ffbbe59ab82f97c989163db04741c9a1d1
 2015-03-02 11:20:15 -05:00
Geoff Mendal
f63a665f92 Merge "Import translations. DO NOT MERGE" 2015-03-02 15:47:51 +00:00
Geoff Mendal
e001b3051a Import translations. DO NOT MERGE 
Change-Id: I3e5fd4152be52ddbd9bb0aa7ad4f5422331b5e57
Auto-generated-cl: translation import
 2015-03-02 07:45:58 -08:00
Geoff Mendal
5ac82a5117 Merge "Import translations. DO NOT MERGE" 2015-03-02 15:37:30 +00:00
Geoff Mendal
357b926120 Merge "Import translations. DO NOT MERGE" 2015-03-02 15:11:15 +00:00
Geoff Mendal
b409d300d1 Import translations. DO NOT MERGE 
Change-Id: I54de8a6c8accba25846ccea871e096df4bbee52c
Auto-generated-cl: translation import
 2015-03-02 07:01:31 -08:00
Geoff Mendal
3c89ff2289 Import translations. DO NOT MERGE 
Change-Id: I209860801eccbb182374ecb6abe8ddc0a0bca700
Auto-generated-cl: translation import
 2015-03-02 06:44:30 -08:00
Geoff Mendal
828e0f78b3 am e80017ab: (-s ours) am e4679922: (-s ours) am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e80017ab4422c67e2565e53869d0cfc6a70b966d':
  Import translations. DO NOT MERGE
 2015-03-02 14:36:17 +00:00
Geoff Mendal
e80017ab44 am e4679922: (-s ours) am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e467992236a40646d31a9171ecaac51b0d90fd9a':
  Import translations. DO NOT MERGE
 2015-03-02 14:30:00 +00:00
Geoff Mendal
d866fa0490 am fdbfd3c9: (-s ours) am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE 
* commit 'fdbfd3c995b132e60c8ee8644ad5759bd318928a':
  Import translations. DO NOT MERGE
 2015-03-02 14:29:58 +00:00
Geoff Mendal
fdbfd3c995 am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE 
* commit 'b77346add048f7aa776ecf55400a711598fc8aa9':
  Import translations. DO NOT MERGE
 2015-03-02 14:24:49 +00:00
Geoff Mendal
e467992236 am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'fe78077418982794dc4b8966e3d389ce0f7ad13c':
  Import translations. DO NOT MERGE
 2015-03-02 14:22:52 +00:00
Geoff Mendal
fe78077418 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-02 14:18:15 +00:00
Geoff Mendal
b77346add0 am 6b5b052e: (-s ours) Import translations. DO NOT MERGE 
* commit '6b5b052ee6b75cee712215284923d2fcd17a7871':
  Import translations. DO NOT MERGE
 2015-03-02 14:16:57 +00:00
Geoff Mendal
341b04711d Import translations. DO NOT MERGE 
Change-Id: Icff770a9eb701279c5011e816970c69c58862174
Auto-generated-cl: translation import
 2015-03-02 06:15:22 -08:00
Geoff Mendal
6b5b052ee6 Import translations. DO NOT MERGE 
Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad
Auto-generated-cl: translation import
 2015-03-02 06:09:28 -08:00