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

141271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
3a959fca91 Log unhandled message which has specific destination. 
Broadcast message is unnecessary to log as broadcast message.

Bug: 16039302
Change-Id: Ifffc09b49bceaaf220ce929206eaecb78146016f
 2014-07-03 09:34:05 +09:00
Alan Viverette
d1ed9b3ea7 Merge "Update dropdown background asset" 2014-07-02 18:17:00 +00:00
Alan Viverette
65b934dba5 Update dropdown background asset 
BUG: 15985882
Change-Id: I9f271bf99371516bce5bad3e1c3f0efbedc8ffdd
 2014-07-02 16:52:01 -07:00
Prerepa Viswanadham
0c116e1573 Obtain capabilities from chipset for it's support of various features 
Change-Id: I01bdb31136be63e4e46fb4e054c902eddc5647ab
 2014-07-02 21:24:37 +00:00
Igor Murashkin
af2b4ce90a Merge "camera2: Add crop region support and some other AE tags to legacy" 2014-07-02 18:22:50 +00:00
Igor Murashkin
df6242e374 camera2: Add crop region support and some other AE tags to legacy 
Change-Id: If7a87b210a57ea13d6329bb363b1c7ecdadc52e8
 2014-07-02 16:38:28 -07:00
Ihab Awad
ecf4d09664 Merge "Fix references to two constants" 2014-07-02 18:17:00 +00:00
Jean-Michel Trivi
6c09004ec0 Send media button events with FLAG_RECEIVER_FOREGROUND set 
bug 11357318

Change-Id: Iccd000bebb31a2f6cb057e97d3ab276861d0b651
 2014-07-02 21:10:43 +00:00
Ihab Awad
6c9566fb2d Fix references to two constants 
The names of two constants missed getting updated in a previous CL,
causing a build breakage.

Change-Id: I2a87f6b3aead2c6b751afedf32a321c8290b51be
 2014-07-02 13:51:50 -07:00
Ihab Awad
9c3f18846a Rename Telecomm "Subscription" to "Account" (1/7) 
Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
	telecomm/java/android/telecomm/InCallCall.java
 2014-07-02 12:27:13 -07:00
Jae Seo
18bbd2100f Merge "TvContract: Add a field for network affiliation to the Channels table" 2014-07-02 18:22:50 +00:00
Tao Bai
f6e1112216 Enable new geolocation permission API. 
BUG: 14668406
Change-Id: I9500154d14eceae0248eb3718de27fc33fef4f28
 2014-07-02 20:38:14 +00:00
Jae Seo
6e90e4ea4f TvContract: Add a field for network affiliation to the Channels table 
This is used to identify a channel that is commonly called by its
network affiliation instead of the display name.

Bug: 15993156
Change-Id: Ib5a15e0e44e815c98b762573b5a24289a86f9583
 2014-07-02 13:01:35 -07:00
Ihab Awad
ad4cc9ba38 Merge "Rename Telecomm "Subscription" to "Account" (1/7)" 2014-07-02 18:22:50 +00:00
Santos Cordon
7a76e87218 Merge "Move cancelMissedCallsNotification to PhoneManager." 2014-07-02 18:17:00 +00:00
Santos Cordon
3c4ff9effc Move cancelMissedCallsNotification to PhoneManager. 
Change-Id: I2ce26e77ef1f0acc11552bf28efc039391e09766
 2014-07-02 23:39:30 +00:00
Craig Mautner
53e3b38b09 Merge "Use cached thumbnails in Recent tasks." 2014-07-02 21:11:19 +00:00
Tyler Gunn
d0154927a8 Adding "start call with video" extra for ACTION_CALL intent. 
Bug: 16014224
Change-Id: I6240b50383de60fbe9038b247856227c6c278b85
 2014-07-02 23:31:46 +00:00
Craig Mautner
c0ffce5ddd Use cached thumbnails in Recent tasks. 
The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.

As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.

Fixes bug 15828934.

Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
 2014-07-02 16:31:46 -07:00
Jason Sams
51cb970968 am 24bea6a3: Resolve conflicts with AOSP. 
* commit '24bea6a3ef53733ffd1622dfa0bdaeea0a74303a':
  Resolve conflicts with AOSP.
 2014-07-02 23:19:27 +00:00
Baligh Uddin
191ba12499 am ed61958a: (-s ours) am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ed61958a254deb6299b907ecb079ebe15da339c3':
  Import translations. DO NOT MERGE
 2014-07-02 23:19:22 +00:00
Baligh Uddin
c685fff9b7 am 0bd94e4b: (-s ours) am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0bd94e4b7a5f490dac0090db931bef0f60121cf9':
  Import translations. DO NOT MERGE
 2014-07-02 23:19:16 +00:00
Baligh Uddin
ac7b1e6032 am 066fb41f: (-s ours) am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '066fb41fc74419d321f385f9d641c014efb474ae':
  Import translations. DO NOT MERGE
 2014-07-02 23:19:12 +00:00
Jason Sams
24bea6a3ef Resolve conflicts with AOSP. 
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
 2014-07-02 14:32:24 -07:00
Martijn Coenen
1a0fd95a46 Merge "Add API to query for AID prefix support." 2014-07-02 20:11:01 +00:00
Martijn Coenen
d92c168974 Add API to query for AID prefix support. 
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.

Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
 2014-07-02 16:30:06 -07:00
Martijn Coenen
b92dc6b013 Clean up dynamic AID XML parser. 
<aid-group> should be generated and parsed
in its own object.

Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
 2014-07-02 14:11:54 -07:00
Martijn Coenen
b51441163f Move AID validation to CardEmulation. 
More logical place since it's a generic utility
function.

Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
 2014-07-02 12:44:33 -07:00
Alan Viverette
396d485ba9 Merge "Add style for SearchView" 2014-07-02 18:17:00 +00:00
Nick Kralevich
4facb0796f resolved conflicts for merge of dbbc0706 to master 
Change-Id: I3b4e442988021d5ac569cb06682bc1355edbb430
 2014-07-02 16:06:55 -07:00
Alan Viverette
5dddb70b4e Add style for SearchView 
BUG: 6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25
 2014-07-02 15:59:30 -07:00
Nick Kralevich
a00144ca89 resolved conflicts for merge of a8dbd7b4 to master 
Change-Id: I90f42546c6d0a8f21af3041e59baf6a226247b1c
 2014-07-02 15:41:21 -07:00
Raph Levien
6df71c76e0 Merge "Fix native crash when typeface is missing" 2014-07-02 18:50:12 +00:00
Raph Levien
27bb05f2dc Fix native crash when typeface is missing 
Creating a typeface from a missing file crashes when it tries to extract
the style from the font. This patch just uses default style when the
resulting font object is NULL.

Bug: 15930808
Change-Id: I9438687100026f336db7aa204fe3a0232eee2db6
 2014-07-02 15:07:39 -07:00
Martijn Coenen
c813dbbfb3 Merge "Clean up dynamic AID XML parser." 2014-07-02 18:22:50 +00:00
Ido Ofir
609332192e Merge "fixing i18n bug. b/15711200" 2014-07-02 21:11:19 +00:00
Ido Ofir
12ea0d24a5 fixing i18n bug. b/15711200 
Change-Id: I485859f6536c68f3d0d3e2d62c21a39705ba87b4
 2014-07-02 13:51:01 -07:00
Martijn Coenen
8d61b67234 Merge "Move AID validation to CardEmulation." 2014-07-02 18:11:52 +00:00
Adrian Roos
287554ca95 Merge "Update QS flashlight icon" 2014-07-02 19:50:27 +00:00
Adrian Roos
e59bd9af26 Update QS flashlight icon 
Bug: 15934851
Change-Id: Id1d08fce8916c29c6cb53eee7cb069b250c0b805
 2014-07-02 20:03:26 +00:00
dcashman
ca76cccb61 Merge "Initial work for key rotation." 2014-07-02 18:22:50 +00:00
dcashman
55b1078e2a Initial work for key rotation. 
Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk.  If no upgrade-keyset is specified, the current logic
involving signatures is used.

Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app.  This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.

Bug: 6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
 2014-07-02 12:51:28 -07:00
Alexandra Gherghina
1e1f2e8926 Merge "Adds per-user APIs required by the Settings app" 2014-07-02 16:34:47 +00:00
Baligh Uddin
ed61958a25 am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e1ef888eac66c247710833746f7e8e2fc1f45c1b':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:10 +00:00
Baligh Uddin
0bd94e4b7a am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:06 +00:00
Baligh Uddin
066fb41fc7 am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'caaf4aed05163df62365d351e592083ba95102cd':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:02 +00:00
Alexandra Gherghina
cb22807ffc Adds per-user APIs required by the Settings app 
Bug: 15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
 2014-07-02 13:34:14 +01:00
Narayan Kamath
dbbc070670 am e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit 'e2840977d37e4d19425d448b54895536e43a2989':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:18:45 +00:00
Narayan Kamath
e2840977d3 am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit '6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:12:18 +00:00
Narayan Kamath
a8dbd7b433 am 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent." 
* commit '39e4f590787246ce35b995c0c0ce37b676a05e0c':
  Fall back to "tl" if "fil" is absent.
 2014-07-02 10:09:45 +00:00