Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,924 Commits 3 Branches 0 Tags
d65cb22872b5dbfb5937d66191b60be22b63fd21
Commit Graph

159924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
0d138dd11a Import translations. DO NOT MERGE 
Change-Id: I0faffa6e483c6dd763c39006825281b188b53443
Auto-generated-cl: translation import
 2014-11-24 08:42:25 -08: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
Adrian Roos
20eb594ab2 am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit '8a9242428b9d631ba841c166d062f158fd64f0f6':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-24 16:08:41 +00:00
Adrian Roos
9b4b2940b7 am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 
* commit '07361c8488aa600573c21e27f728c22d44760ecf':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-24 16:08:36 +00:00
Adrian Roos
520d20c1a8 am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
  Fix DPM.resetPassword("")
 2014-11-24 16:04:13 +00:00
Christoph Studer
30646d87f2 am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '671424951dcd2a0d1059c6d899a8649cbc8b5e26':
  Fix MediaStyle API comments
 2014-11-24 16:04:08 +00:00
Chris Wren
865c73b5f6 am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit '1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
  Push back notification means snooze the package.
 2014-11-24 16:04:00 +00:00
Adrian Roos
8a9242428b Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 2014-11-24 16:03:56 +00:00
Adrian Roos
07361c8488 Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 2014-11-24 16:03:43 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Chris Wren
1aa63f0baf Merge "Push back notification means snooze the package." into lmp-mr1-dev 2014-11-24 15:58:17 +00:00
Geoff Mendal
41d3e943a7 am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ae71b0027f5de71a947bc988ebd1c409e73063e0':
  Import translations. DO NOT MERGE
 2014-11-24 15:35:12 +00:00
Geoff Mendal
c3ab889f9e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 15:33:36 +00:00
Geoff Mendal
ae71b0027f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 15:30:49 +00:00
Geoff Mendal
c6a1070bd6 am 9be80ee5: (-s ours) Import translations. DO NOT MERGE 
* commit '9be80ee53ff5a3df51537f10b3d63f1f7f0ccd3e':
  Import translations. DO NOT MERGE
 2014-11-24 15:27:02 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE 
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
 2014-11-24 07:13:23 -08:00
Geoff Mendal
d2fd0410d9 Import translations. DO NOT MERGE 
Change-Id: Ib6f35d7fd27aa2503ee0e1038e1048c989bf31af
Auto-generated-cl: translation import
 2014-11-24 06:25:15 -08:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE 
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
 2014-11-24 06:21:48 -08:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00
Zoltan Szatmary-Ban
8e55c4bff8 am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev 
* commit '604aec9574212aabb3391585799a72e6820466cd':
  Add new subcommand 'set-active-admin' to the dpm command.
 2014-11-24 12:13:15 +00:00
Zoltan Szatmary-Ban
604aec9574 Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev 2014-11-24 12:08:20 +00:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
 2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-22 20:28:10 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Lajos Molnar
63845f1b58 am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 
* commit 'c398f175cdc2ceb31bc45b6541f7cd9c3c52406a':
  media: fix isSupportedFormat for integer frame rate
 2014-11-22 06:02:51 +00:00
Lajos Molnar
c398f175cd Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 2014-11-22 05:59:31 +00:00
Eino-Ville Talvala
e289082a70 am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'dfa99f63677c238453293f48b62b4fffcc101262':
  Camera: Add new capability flags as system features as well
 2014-11-22 05:00:48 +00:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state. 
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
 2014-11-22 03:25:39 +00:00
RoboErik
74086d44ff am a08adb24: Fix binder equality check 
* commit 'a08adb2437f641087e01436293736be235fe1fda':
  Fix binder equality check
 2014-11-22 02:43:31 +00:00
RoboErik
a08adb2437 Fix binder equality check 
Forgot to call .asBinder() before checking binders for equality. This
fixes a memory leak caused by the system holding on to binders.

bug:18049316
Change-Id: I43a9f4163b28cf1a77e59c3e7bade32bd2ef1c1a
 2014-11-21 18:28:18 -08:00
Dianne Hackborn
b2411f77ca Final resource IDs. 
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
 2014-11-21 17:04:53 -08:00
Joe Fernandez
0c7d2d2fa8 am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '85f463c5b59350fa4c4a05007f8a7b65a9a89da3':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-22 00:30:37 +00:00