Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Natalie Masse
e24908e342 Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation 
Change-Id: Ie433d4bfd7ac7fd2e524a201497c250a7aede47d
 2014-11-24 18:38:00 +00:00
Paul Jensen
080b02fc6c am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit 'e57064a289082758fcb9bb71f987dde84931e3e6':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-24 18:36:27 +00:00
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +00:00
Geoff Mendal
5d50bf02a6 am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '44b769d0103df57ccf16f84e037af7d44950aa0a':
  Import translations. DO NOT MERGE
 2014-11-24 18:32:14 +00:00
Paul Jensen
e57064a289 Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev 2014-11-24 18:30:36 +00:00
Svet Ganov
f34896bbeb am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'c9f499d2f1cd598b90bfb8c13e505354555caea8':
  Print spooler crash when printing after a rotation.
 2014-11-24 18:27:52 +00:00
Amit Mahajan
ed7ccb45c0 am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit '77348365088577fd760c9d18f488c30dcc2fe1c2':
  Set network selection to automatic when in Global mode
 2014-11-24 18:27:46 +00:00
John Reck
c68728f5e9 am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'b059ff81570247f8c00098c68ffafcbf98941d54':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-24 18:27:41 +00:00
Geoff Mendal
44b769d010 am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3a013dab155acafab6a80e6b13a82252b69abd9f':
  Import translations. DO NOT MERGE
 2014-11-24 18:24:23 +00:00
Svet Ganov
c9f499d2f1 Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 2014-11-24 18:23:37 +00:00
Amit Mahajan
7734836508 Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 2014-11-24 18:22:02 +00:00
John Reck
b059ff8157 am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit '2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-24 18:19:45 +00:00
Geoff Mendal
3a013dab15 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-24 18:18:15 +00:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Lajos Molnar
7d612f0deb am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 
* commit '0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb':
  media: fix isSupportedFormat for integer frame rate
 2014-11-24 18:12:56 +00:00
Eino-Ville Talvala
a48e26bb65 am bd9567e1: am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'bd9567e1569a6fc5222427f18cc653c29c0beb89':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:12:51 +00:00
RoboErik
01d9c3ba31 am e36131be: am 74086d44: am a08adb24: Fix binder equality check 
* commit 'e36131bee6e52be03227f1103e4ce23528e243da':
  Fix binder equality check
 2014-11-24 18:12:47 +00:00
Joe Fernandez
a37ec5abb6 am 7ce31112: am 0c7d2d2f: am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '7ce31112b2252f8a3283e4d29ea42cf5780deef2':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-24 18:12:38 +00:00
Scott Rowe
727c1b6861 am 78639221: am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '7863922116fd0836a58b705efed861b12d661fcd':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-24 18:12:33 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Lajos Molnar
0b10f9c0ab am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 
* commit '63845f1b5853aa3a84df4a161f6c8e96b98fba8a':
  media: fix isSupportedFormat for integer frame rate
 2014-11-24 18:05:46 +00:00
Eino-Ville Talvala
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:05:40 +00:00
RoboErik
e36131bee6 am 74086d44: am a08adb24: Fix binder equality check 
* commit '74086d44ff5c0d8c194ab745fedf2121eba1c8d5':
  Fix binder equality check
 2014-11-24 18:05:31 +00:00
Joe Fernandez
7ce31112b2 am 0c7d2d2f: am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '0c7d2d2fa8ce801d608db2da6670d10720eaea16':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-24 18:05:17 +00:00
Scott Rowe
7863922116 am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-24 18:05:11 +00:00
Dianne Hackborn
d65cb22872 am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '2bbea56d1258f7b55183ddba6364815f17aafe88':
  Final resource IDs.
 2014-11-24 17:59:48 +00:00
Dianne Hackborn
608439df38 am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-24 17:59:43 +00:00
John Reck
2b36a86b8e Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf)
 2014-11-24 17:59:38 +00:00
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Jeff Brown
8cac73097e am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b5686d55963e76c801ca0581a1012c5f4aa8d009':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:40:02 +00:00
Tom Taylor
86201db27e Issues with messaging apps on non-primary user account 
Bug 18399514

Adjust the contentUri to contain the caller's userId so that when
the phone process tries to open the Uri, it will open the provider
on the correct user.
Also make sure the Uri grants are properly qualified. We only need to grant
permission for sending. Receiving an MMS is always done by the primary
user and doesn't need special permissions. Move various permission grants
from the SmsManager to here.

Change-Id: Ib192f651ab05db9f07e9e6245bb343ed7a55b18e
 2014-11-24 09:36:43 -08:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:34:32 +00:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
 2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
 2014-11-24 17:28:09 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title. 
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
 2014-11-24 12:25:32 -05:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages. 
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
 2014-11-24 09:25:00 -08:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
 2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Geoff Mendal
1df8d4c5e0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 16:56:49 +00:00
Geoff Mendal
234e25fbda Import translations. DO NOT MERGE 
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
 2014-11-24 08:51:30 -08:00
Geoff Mendal
0d138dd11a Import translations. DO NOT MERGE 
Change-Id: I0faffa6e483c6dd763c39006825281b188b53443
Auto-generated-cl: translation import
 2014-11-24 08:42:25 -08:00
Narayan Kamath
98c6029878 am 97ee3f7c: resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp 
* commit '97ee3f7ca6ca3959f4fff4d264921c1c4e379bba':
  Stop using DATE_FORMAT from settings.
 2014-11-24 16:39:35 +00:00
Narayan Kamath
97ee3f7ca6 resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic2826f3be8337e72a80978e4565e0884b9ceed70
 2014-11-24 16:32:06 +00:00
Jorim Jaggi
fc4d8043de am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit 'f510a8a688acf08378419aae20d2be25b88a4397':
  Tint SIM images in PIN/PUK screen
 2014-11-24 16:30:13 +00:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +00:00
Narayan Kamath
65af39f57e am 43395d67: am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT." 
* commit '43395d677b431def5e6d8707297d590ba8f204a1':
  Stop reading Settings.System.DATE_FORMAT.
 2014-11-24 16:23:59 +00:00
Narayan Kamath
98b8fe747a am 32ed090f: Merge "Stop using DATE_FORMAT from settings." 
* commit '32ed090f5af4d533660759664f2542b99dbda7d9':
  Stop using DATE_FORMAT from settings.
 2014-11-24 16:19:31 +00:00