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

164322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
de3ac8f9fc am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-26 05:54:44 +00:00
Deepanshu Gupta
50e1406a4a am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit 'f6b08547458b9219da1717a79363f778bfc57dd0':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-26 05:54:39 +00:00
Deepanshu Gupta
81990c3f98 am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit 'b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-26 05:54:33 +00:00
Deepanshu Gupta
0a07bb95a1 am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'aa72988955789be6e790c344daba3ef17abfcd98':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 05:54:28 +00:00
Deepanshu Gupta
bbbdc2ad89 am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 05:54:23 +00:00
Deepanshu Gupta
92480a9ad8 Fix include tag rendering. [DO NOT MERGE] 
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)
 2015-08-25 12:06:42 -07:00
Deepanshu Gupta
f6b0854745 Show better error message for color attr not found. [DO NOT MERGE] 
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)
 2015-08-25 12:06:42 -07:00
Deepanshu Gupta
b1370c2687 Fix build: udpate parser factory method [DO NOT MERGE] 
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)
 2015-08-25 12:06:41 -07:00
Deepanshu Gupta
aa72988955 Don't keep LayoutlibCallback reference. [DO NOT MERGE] 
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)
 2015-08-25 12:06:41 -07:00
Deepanshu Gupta
5c90c4f459 Remove kxml dependency [DO NOT MERGE] 
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)
 2015-08-25 12:06:30 -07:00
Sebastien Hertz
b63e291d05 am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:53:07 +00:00
Sebastien Hertz
88556ac221 am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:37:46 +00:00
Sebastien Hertz
599dc2bd1c am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:29:30 +00:00
Sebastien Hertz
50af68e74a am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:18:38 +00:00
Sebastien Hertz
55f86b1811 am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:09:22 +00:00
Sebastien Hertz
9e7a0ddb65 am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 09:50:24 +00:00
Sebastien Hertz
a2d193183f am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:19:10 +00:00
Sebastien Hertz
87a786afdb am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:08:43 +00:00
Sebastien Hertz
445ab7fa43 am ff8dc212: Allow debugging only for apps forked from zygote 
* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:01:02 +00:00
Sebastien Hertz
18089ceb71 Allow debugging only for apps forked from zygote DO NOT MERGE 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
 2015-08-19 17:12:34 +02:00
Sebastien Hertz
ff8dc21278 Allow debugging only for apps forked from zygote 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
 2015-08-19 11:25:56 +02:00
Adrian Roos
b2f8c716e8 am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit '50ed152ab646b00714947a9cf75e01e618b16c02':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-23 21:31:41 +00:00
Adrian Roos
50ed152ab6 am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit '7f63ef380ff8c95ea43edd832a7b986ad362e7cf':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-23 18:47:07 +00:00
Adrian Roos
7f63ef380f am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit '9b6a60991453136819a6feeca404e1102e78f735':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-23 18:34:56 +00:00
Adrian Roos
9b6a609914 Prevent insanely long passwords from crashing SystemUI 
Bug: 22214934
Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f
 2015-07-22 22:10:57 +00:00
Diego Perez
d6f2a9efbb am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev 
* commit '7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
  Render to measured size when using expand mode
 2015-07-21 13:06:52 +00:00
Diego Perez
7720eb18c1 Merge "Render to measured size when using expand mode" into lmp-mr1-dev 2015-07-21 12:56:56 +00:00
Wale Ogunwale
22cd16a01f am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'bc4743ebe845958fab8bbb0d0a425d55ece3d205':
  Prevent system uid component from running in an app process
 2015-07-02 00:50:52 +00:00
Wale Ogunwale
bc4743ebe8 am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '7ab264abc214b7e1b7fff9934814020cea5f18fa':
  Prevent system uid component from running in an app process
 2015-07-02 00:37:02 +00:00
Wale Ogunwale
7ab264abc2 am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '742bfa809cf2c022d690f84b4213e908ee66e8aa':
  Prevent system uid component from running in an app process
 2015-07-01 17:17:23 +00:00
Wale Ogunwale
5278cea1f3 am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'd72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:58 +00:00
Wale Ogunwale
5203432808 am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:54 +00:00
Wale Ogunwale
742bfa809c am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:02 +00:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
 2015-07-01 16:39:11 +00:00
Wale Ogunwale
d72dc76275 am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'ec425a19f973e2511485b61424dffb9f3cafb542':
  Prevent system uid component from running in an app process
 2015-07-01 16:35:21 +00:00
Wale Ogunwale
131e6b24d8 Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 2015-07-01 16:30:43 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:42 +00:00
Wale Ogunwale
c215b2b245 am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:17 +00:00
Wale Ogunwale
df9948d812 Merge "Prevent system uid component from running in an app process" into lmp-dev 2015-07-01 16:06:48 +00:00
Wale Ogunwale
dc9cfca801 Merge "Prevent system uid component from running in an app process" into klp-dev 2015-07-01 16:06:34 +00:00
Amit Mahajan
43d3bd0276 am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '8363104782302c08f2f03d4e1e345edb7f20876c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:11:48 +00:00
Joe Fernandez
72356f0b20 am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'f1686ac225c75991d931348818065f9e99cf0b73':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 20:11:40 +00:00
Amit Mahajan
8363104782 am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:00:00 +00:00
Joe Fernandez
f1686ac225 am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:59:53 +00:00
Amit Mahajan
22766e85d8 am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 19:45:08 +00:00
Joe Fernandez
88c2d704c3 am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:45:03 +00:00
Amit Mahajan
bcf9223b3b am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 18:21:50 +00:00
Joe Fernandez
4bd25634f1 am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '765255b41229553842da855b8e5d9dfa87cf8e2b':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 18:21:41 +00:00
Amit Mahajan
b98f786c8a am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '5b8976a5eaffe81a742ec2600cf9b63e911f978c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:34:59 +00:00
Amit Mahajan
23444e76d2 am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:31:49 +00:00