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

185089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
8a9355a98e Output modified bcp47 tag in ResTable_config::toString() 
We expect to be able to parse the output of ResTable_config::toString(),
so it should use modified bcp47 (b+en+Latn+US).

Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
 2015-03-16 22:25:26 +00:00
Adam Lesinski
9c329b8b64 Merge "Only attempt to load .apk files in AssetManager" 2015-03-16 22:16:04 +00:00
Adam Lesinski
1dd50c54b5 Only attempt to load .apk files in AssetManager 
This will reduce the number of files we must open
and reduce log spam.

Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
 2015-03-16 15:10:56 -07:00
Dianne Hackborn
a501a021c3 Merge "Add new voice request for picking from a list." 2015-03-16 22:01:51 +00:00
Andreas Gampe
2851d7d0fd am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
  Frameworks/base: Force long computation
 2015-03-16 21:58:39 +00:00
Tor Norbye
da81fa569e Merge "Add resource type annotations to some APIs" 2015-03-16 21:20:31 +00:00
Andreas Gampe
7f95a1bc32 am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
 2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b Merge "Frameworks/base: Force long computation" 2015-03-16 20:37:02 +00:00
Andreas Gampe
716475daa1 am e6857531: am f3e581c9: Merge "Frameworks/base: Check before foreach in Script" 
* commit 'e685753136ee8e88212ad95b24284a153c86a0c1':
  Frameworks/base: Check before foreach in Script
 2015-03-16 20:26:43 +00:00
Andreas Gampe
6ec9fd8b3b am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 20:26:32 +00:00
Derek Sollenberger
dc16e24afc Merge "Add conic support to HWUI path tessellator." 2015-03-16 19:40:08 +00:00
Andreas Gampe
e685753136 am f3e581c9: Merge "Frameworks/base: Check before foreach in Script" 
* commit 'f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
  Frameworks/base: Check before foreach in Script
 2015-03-16 19:31:17 +00:00
Derek Sollenberger
b0772a6cc5 Add conic support to HWUI path tessellator. 
bug: 19732872
Change-Id: Ic3ae46f746325468ab972c9daf829099165eb596
 2015-03-16 15:28:16 -04:00
Andreas Gampe
c3228a9d40 am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit '3d33314e03c24758e3b3bbd9e23e40199a259b80':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 19:22:00 +00:00
Andreas Gampe
f3e581c99f Merge "Frameworks/base: Check before foreach in Script" 2015-03-16 19:17:45 +00:00
Andreas Gampe
3d33314e03 Merge "Frameworks/base: Use equals for Integer comparison" 2015-03-16 19:10:40 +00:00
Eric Laurent
aff57b7519 Merge "broadcast radio API" 2015-03-16 18:30:23 +00:00
Eric Laurent
d92e28255e Merge "broadcast radio JNI." 2015-03-16 18:29:22 +00:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list. 
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
 2015-03-16 11:29:12 -07:00
Andreas Gampe
872d191e61 am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:11:47 +00:00
Andreas Gampe
8af305f17f am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:03:17 +00:00
Selim Cinek
b60a658edb Merge "Added more anti-falsing logic" 2015-03-16 18:01:00 +00:00
Selim Cinek
547a06b50f Added more anti-falsing logic 
We now discard unlock attempts with multiple pointers.

Bug: 18544191
Change-Id: Id2e7bca0353b3f85aa193f6a5c793b93ca0776e3
 2015-03-16 10:53:08 -07:00
Andreas Gampe
6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor"" 2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb Revert "Frameworks/base: Fix a constructor" 
The constructor was public API, doh. Gotta do this differently.

This reverts commit 33c5b2a62f3e62382c41e24c6b527119978816a0.

Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
 2015-03-16 17:51:01 +00:00
Andreas Gampe
08067d9829 am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
  Frameworks/base: Fix null-pointer check
 2015-03-16 17:20:12 +00:00
Andreas Gampe
ebb8922a5b am 19279ec0: am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit '19279ec04845b2a47b90240c9d47bf8fb5ece464':
  Frameworks/base: Fix a constructor
 2015-03-16 17:13:26 +00:00
Andreas Gampe
8e176d396d am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
  Frameworks/base: Fix null-pointer check
 2015-03-16 17:12:57 +00:00
Andreas Gampe
19279ec048 am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
  Frameworks/base: Fix a constructor
 2015-03-16 17:03:02 +00:00
Andreas Gampe
007e207bde Merge "Frameworks/base: Fix null-pointer check" 2015-03-16 16:59:14 +00:00
Andreas Gampe
d61cbf9a08 Merge "Frameworks/base: Fix a constructor" 2015-03-16 16:51:01 +00:00
Robert Greenwalt
88dadfaa3b am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:48:46 +00:00
Andreas Gampe
1109006158 resolved conflicts for merge of 038b8462 to master 
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
 2015-03-16 09:45:34 -07:00
Ronghua Wu
0e22acb635 Merge "media: add MediaFormat.KEY_PRIORITY." 2015-03-16 16:38:25 +00:00
Robert Greenwalt
7cff91ea67 am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:29:52 +00:00
Robert Greenwalt
079cfa64ec Merge "Frameworks/base: Fix a hashCode implementation" 2015-03-16 16:17:51 +00:00
Andreas Gampe
038b846284 am 5abcd06b: Merge "Frameworks/base: Fix always-false equals" 
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
  Frameworks/base: Fix always-false equals
 2015-03-16 15:43:37 +00:00
Mike Reed
def6ef85c5 Merge "use SkFilterQuality instead of SkPaint::FilterLevel" 2015-03-16 15:36:43 +00:00
Mike Reed
2a1ce8a4e5 use SkFilterQuality instead of SkPaint::FilterLevel 
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
 2015-03-16 11:31:38 -04:00
Geoff Mendal
2c782e7cf8 Merge "Import translations. DO NOT MERGE" 2015-03-16 15:29:52 +00:00
Andreas Gampe
5abcd06b1f Merge "Frameworks/base: Fix always-false equals" 2015-03-16 15:28:53 +00:00
John Reck
2c528c2175 am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast
 2015-03-16 15:16:17 +00:00
John Reck
059ba9814b am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast
 2015-03-16 15:09:04 +00:00
John Reck
386dcbddf5 Merge "Frameworks/base: Fix missing cast" 2015-03-16 14:56:52 +00:00
Geoff Mendal
d64e48d850 Import translations. DO NOT MERGE 
Change-Id: Ib0dfcbb5ffa71a512164af5435a0784279bde292
Auto-generated-cl: translation import
 2015-03-16 07:43:37 -07:00
Robin Lee
ee1f24ff29 Merge "Recognise insecure encryption with a new constant" 2015-03-16 14:32:12 +00:00
Geoff Mendal
592f880895 Merge "Import translations. DO NOT MERGE" 2015-03-16 14:02:00 +00:00
Geoff Mendal
70c1675036 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:48:55 +00:00
Geoff Mendal
47c6843cb5 Import translations. DO NOT MERGE 
Change-Id: I5974745b1b216beda4ebed9da78b0b2c0b4d4efe
Auto-generated-cl: translation import
 2015-03-16 06:37:26 -07:00
Geoff Mendal
717bbf53f8 Import translations. DO NOT MERGE 
Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a
Auto-generated-cl: translation import
 2015-03-16 06:25:49 -07:00