Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
485c25ba46 am e3abfef6: am 82f6b16e: Merge "hwui : fix memory leak due to duplicate in shadow cache" 
* commit 'e3abfef62b7dcfa3ca44f133b19ed316a33a97c6':
  hwui : fix memory leak due to duplicate in shadow cache
 2015-03-25 16:47:41 +00:00
Alan Viverette
7506f499b5 Merge "Fix to crash when clicking text link without view activity" 2015-03-25 16:35:37 +00:00
Chris Craik
e3abfef62b am 82f6b16e: Merge "hwui : fix memory leak due to duplicate in shadow cache" 
* commit '82f6b16e10a116a42e32c99c34fb2d435da21fd5':
  hwui : fix memory leak due to duplicate in shadow cache
 2015-03-25 16:28:58 +00:00
Alex Klyubin
98ff619d79 am d4a2e7c4: am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy." 
* commit 'd4a2e7c4040fdcd114cfa50293504a602bc3b8b4':
  Address pending comments for NetworkSecurityPolicy.
 2015-03-25 16:23:46 +00:00
Alex Klyubin
d4a2e7c404 am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy." 
* commit 'ff022cb1bd70fc4c9f973af5afebf51517bda572':
  Address pending comments for NetworkSecurityPolicy.
 2015-03-25 16:18:50 +00:00
Bryce Lee
3309be5e7b am 21b7e6de: am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 
* commit '21b7e6de94b1e4d0bbe2f1a13ac19f491ff466ed':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
 2015-03-25 16:16:42 +00:00
Chris Craik
82f6b16e10 Merge "hwui : fix memory leak due to duplicate in shadow cache" 2015-03-25 16:15:12 +00:00
Bryce Lee
21b7e6de94 am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 
* commit 'c831b978238d5ed200ca329c540eff00faba77e3':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
 2015-03-25 16:09:48 +00:00
Bryce Lee
c831b97823 Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 2015-03-25 16:06:17 +00:00
Alex Klyubin
403a494d56 Framework's NetworkSecurityPolicy delegates to libcore's one. 
Now that the libcore's NetworkSecurityPolicy abstraction is in place,
the framework version of the abstraction should delegate to the
libcore one, to avoid them getting out of sync.

Bug: 19215516
Change-Id: Ic57341d703a13e0fb100dc414958e8fd54e03816
 2015-03-25 09:00:37 -07:00
Geoff Mendal
b0d49833be am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'd86a584f101a5932a8fa2b686ef052e22e004854':
  Import translations. DO NOT MERGE
 2015-03-25 15:50:43 +00:00
Geoff Mendal
d86a584f10 am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '9cfd002e06c32789ae57698a2d5ca565d7128a49':
  Import translations. DO NOT MERGE
 2015-03-25 15:45:39 +00:00
Alex Klyubin
ff022cb1bd Merge "Address pending comments for NetworkSecurityPolicy." 2015-03-25 15:34:36 +00:00
Geoff Mendal
3325448639 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-25 15:34:00 +00:00
Geoff Mendal
9cfd002e06 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-25 15:33:48 +00:00
Geoff Mendal
46eec7312d Import translations. DO NOT MERGE 
Change-Id: Iab12136de9a5c22854fa0224f64bb88ad3c5f049
Auto-generated-cl: translation import
 2015-03-25 07:41:57 -07:00
Geoff Mendal
f205d3070f Import translations. DO NOT MERGE 
Change-Id: I2577a86f9122987bb941278a290022da1ea61f9d
Auto-generated-cl: translation import
 2015-03-25 07:33:12 -07:00
Jason Monk
a644c01db2 am 4c1a49fc: am 039013c2: Merge "Sort Bluetooth devices in quick settings by name" 
* commit '4c1a49fc53a6e9caacfb6d6a8c4c114c2b9a61a9':
  Sort Bluetooth devices in quick settings by name
 2015-03-25 14:31:55 +00:00
Jason Monk
4c1a49fc53 am 039013c2: Merge "Sort Bluetooth devices in quick settings by name" 
* commit '039013c28ef634ab1b630292cc38fb57f206dffd':
  Sort Bluetooth devices in quick settings by name
 2015-03-25 14:25:10 +00:00
Jason Monk
039013c28e Merge "Sort Bluetooth devices in quick settings by name" 2015-03-25 14:12:13 +00:00
Gus Prevas
60b0846fc2 am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit 'c4d7fc10211e9f08317c94e64ac57447e04af428':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:08:39 +00:00
Gus Prevas
c4d7fc1021 am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:02:46 +00:00
Gus Prevas
568356ff9a Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 2015-03-25 12:55:37 +00:00
Paul Crowley
a23995c233 Fix NPE if FPE service does not exist. 
Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
 2015-03-25 11:43:42 +00:00
Deepanshu Gupta
e773c20d43 am 693236b3: am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '693236b367050f40b02ab22991d30eb260ec53ea':
  Update JRE for runConfigurations.
 2015-03-25 00:22:57 +00:00
Deepanshu Gupta
73a92bd7d1 am 83ba89e9: am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '83ba89e94a0ae81875d62666cc67e9f5a357d7ea':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:22:54 +00:00
Deepanshu Gupta
e2b8501695 am ce2b74f7: am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'ce2b74f729ea79b86a69cd3f8dd505aa93d0025b':
  Fix RoundRect radius.
 2015-03-25 00:22:50 +00:00
Deepanshu Gupta
659413d6a2 am 5c03cd8a: am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '5c03cd8aadcfbf118405bfa5fb2fb95b5561da04':
  Use right colors for status bar and nav bar.
 2015-03-25 00:22:46 +00:00
Deepanshu Gupta
eb96b231b2 am 25557e0a: am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '25557e0a96c3987c35405fbec56c561ceeb6daf0':
  Better shadows.
 2015-03-25 00:22:41 +00:00
Deepanshu Gupta
f0e713a67a am 01f9ad1c: am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '01f9ad1c671f0b14554ce6ccec10f34e86a49a2a':
  Fix layoutlib tests.
 2015-03-25 00:22:37 +00:00
Deepanshu Gupta
693236b367 am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'c263a07a55a9806147304a1420ceec2d27a6b49d':
  Update JRE for runConfigurations.
 2015-03-25 00:15:44 +00:00
Deepanshu Gupta
83ba89e94a am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '3deade5981372fc44e83c161c7d0dbb9df529e3f':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:15:39 +00:00
Deepanshu Gupta
ce2b74f729 am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e51f5cdcf34fe127792a177a3953dad03ef23647':
  Fix RoundRect radius.
 2015-03-25 00:15:33 +00:00
Deepanshu Gupta
5c03cd8aad am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '96a67430c0088168f21b230c64c348a53e672538':
  Use right colors for status bar and nav bar.
 2015-03-25 00:15:28 +00:00
Deepanshu Gupta
25557e0a96 am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '5f0252dee43a1cd0f1591b3c9bea2d47ad1f3df0':
  Better shadows.
 2015-03-25 00:15:22 +00:00
Deepanshu Gupta
01f9ad1c67 am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
  Fix layoutlib tests.
 2015-03-25 00:15:14 +00:00
Deepanshu Gupta
c263a07a55 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-25 00:09:01 +00:00
Deepanshu Gupta
3deade5981 am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:08:54 +00:00
Deepanshu Gupta
e51f5cdcf3 am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
 2015-03-25 00:08:47 +00:00
Deepanshu Gupta
96a67430c0 am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
 2015-03-25 00:08:41 +00:00
Deepanshu Gupta
5f0252dee4 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
 2015-03-25 00:08:35 +00:00
Deepanshu Gupta
2ceb310d09 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
 2015-03-25 00:08:28 +00:00
Deepanshu Gupta
862f5900e8 am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
  Update JRE for runConfigurations.
 2015-03-25 00:02:18 +00:00
Deepanshu Gupta
dbb38b3061 am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:02:06 +00:00
Deepanshu Gupta
e97079d97a am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.
 2015-03-25 00:01:58 +00:00
Deepanshu Gupta
2b98abde26 am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.
 2015-03-25 00:01:53 +00:00
Deepanshu Gupta
6fa9d5546f am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.
 2015-03-25 00:01:49 +00:00
Deepanshu Gupta
5bc625d83d am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.
 2015-03-25 00:01:43 +00:00
Deepanshu Gupta
44b5a1c847 am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.
 2015-03-24 23:55:18 +00:00
Deepanshu Gupta
cbb4ec7867 am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]
 2015-03-24 23:55:14 +00:00