OSDN Git Service
Raph Levien [Tue, 9 Aug 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Update lint check to accommodate new emoji sequences"
Doris Ling [Tue, 9 Aug 2016 23:41:51 +0000 (23:41 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback"
Chong Zhang [Tue, 9 Aug 2016 22:48:09 +0000 (22:48 +0000)]
Merge "Put activity into stopped state if recreated while stopped"
Chong Zhang [Tue, 9 Aug 2016 19:57:38 +0000 (12:57 -0700)]
Put activity into stopped state if recreated while stopped
Move handling of recreate from client side to AMS, so that relaunch
happens at the right condition and activity goes to right state
after it's relaunched.
bug:
30060825
Change-Id: Ia475c26927b305eb25ae12be8640aab1fb7677a0
Erik Wolsheimer [Tue, 9 Aug 2016 22:12:02 +0000 (22:12 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am:
002dd29764 am:
c327afa0df
am:
97e9bd749c
Change-Id: I471e5bb6b455a75af953872669e111ba7f100155
Erik Wolsheimer [Tue, 9 Aug 2016 22:11:57 +0000 (22:11 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked am:
b2b3b64417 am:
d491a974c1
am:
2c4a6f5ccd
Change-Id: Id5cb7e86d5b798c66901208e257b0e0835526fe2
Alexandria Cornwall [Tue, 9 Aug 2016 22:07:58 +0000 (22:07 +0000)]
Merge "AAPT2: Merge binary XML file attributes"
Erik Wolsheimer [Tue, 9 Aug 2016 22:04:15 +0000 (22:04 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am:
002dd29764
am:
c327afa0df
Change-Id: I80cb7201377288d43ff9d02367f8e6917de3639f
Erik Wolsheimer [Tue, 9 Aug 2016 22:04:12 +0000 (22:04 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked am:
b2b3b64417
am:
d491a974c1
Change-Id: I0cd3ae219ef819e02782deeb762b902fc89cc64c
Erik Wolsheimer [Tue, 9 Aug 2016 21:55:27 +0000 (21:55 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev
am:
002dd29764
Change-Id: I9ae51ec34a606904c027cc8f987db29160cb3b78
Erik Wolsheimer [Tue, 9 Aug 2016 21:55:25 +0000 (21:55 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked
am:
b2b3b64417
Change-Id: I52ae2660aa36dccd8bb28d189999d4d842834497
Doris Ling [Mon, 8 Aug 2016 23:17:43 +0000 (16:17 -0700)]
Add metrics logging for Settings -> Help & Feedback
Add new metrics event constant for Settings->Help & Feedback, and log it
whenever user selects the help option menu, passing the context extra for
the corresponding settings preference where the help menu is launched.
Change-Id: I971e8e50b959a5451ed085e5da5fd8504111e6c3
Fixes:
30140281
Jorim Jaggi [Tue, 9 Aug 2016 21:48:48 +0000 (21:48 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev am:
529319d81d am:
2dbb93e41d
am:
129f8b59e9
Change-Id: Ib7ee181a60d9a8b617349992615fa571a65d233a
Jorim Jaggi [Tue, 9 Aug 2016 21:48:41 +0000 (21:48 +0000)]
Fix navigation bar in seascape in BackdropFrameRenderer am:
9a7d0a5f84 am:
cbd845adff
am:
ba926070ac
Change-Id: I82863f7c907c36ec852a444d5e418022dfa4304f
TreeHugger Robot [Tue, 9 Aug 2016 21:48:06 +0000 (21:48 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev
Jorim Jaggi [Tue, 9 Aug 2016 21:42:32 +0000 (21:42 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev am:
529319d81d
am:
2dbb93e41d
Change-Id: I72969ee42d7e0d50a87d9c8829d9f96f0ab8a91f
Jorim Jaggi [Tue, 9 Aug 2016 21:42:25 +0000 (21:42 +0000)]
Fix navigation bar in seascape in BackdropFrameRenderer am:
9a7d0a5f84
am:
cbd845adff
Change-Id: I21133f8441ec3ba6ef6a664dd382570ab95f9a1e
Jorim Jaggi [Tue, 9 Aug 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev
am:
529319d81d
Change-Id: I5f6e8d98188b829592357570cef8d4cebd045ca3
Jorim Jaggi [Tue, 9 Aug 2016 21:37:24 +0000 (21:37 +0000)]
Fix navigation bar in seascape in BackdropFrameRenderer
am:
9a7d0a5f84
Change-Id: If63b339fd838172fb084ccf664b7d90dce5d2254
Hemal Patel [Tue, 9 Aug 2016 21:36:03 +0000 (21:36 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09 am:
4e79fcdc0a am:
a32049ce57
am:
97be53ef7f
Change-Id: I749613c5f3ab5677fbedca3b13990e01ba3ebb30
Hemal Patel [Tue, 9 Aug 2016 21:36:00 +0000 (21:36 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b am:
f8c0a138fb am:
5f573a891e
am:
6792875534
Change-Id: Iaea55e6c295fb7e06c9251ee91dc8b77ba392169
Hemal Patel [Tue, 9 Aug 2016 21:35:56 +0000 (21:35 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761 am:
ee3c5b3cd5 am:
ae5f7e27a0
am:
1cb0c7dc93
Change-Id: I7ee33b59e5b3fc9dd6f4a46e105151b281afe67e
Hemal Patel [Tue, 9 Aug 2016 21:35:52 +0000 (21:35 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3 am:
ed51cf2c85 am:
3026c87001
am:
b87f2b17f8
Change-Id: I92db28b8b20f686000eccc7499bebe9a6c4c1393
TreeHugger Robot [Tue, 9 Aug 2016 21:29:03 +0000 (21:29 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev
Raph Levien [Tue, 9 Aug 2016 21:28:54 +0000 (14:28 -0700)]
Update lint check to accommodate new emoji sequences
These are not yet ready for updating in the unicode data, so we patch
them in code until they are.
Bug:
30594617
Change-Id: Ib4c8568aa4840341474eb0c0c95674d640473f4d
Hemal Patel [Tue, 9 Aug 2016 21:27:24 +0000 (21:27 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09 am:
cae34dc577
am:
931af56883
Change-Id: I00a18e0b424b295df63fde09c1371436a4225970
Hemal Patel [Tue, 9 Aug 2016 21:27:21 +0000 (21:27 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b am:
3547fd0642
am:
b4bd409237
Change-Id: If00a0e3c869e6dba3e844ad59b5607f1b411f649
Hemal Patel [Tue, 9 Aug 2016 21:27:17 +0000 (21:27 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761 am:
57d3e1c9e1
am:
068933565f
Change-Id: Ie8e2f713fde6fc23e526b2fc346fa97e74e25112
Hemal Patel [Tue, 9 Aug 2016 21:27:13 +0000 (21:27 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3 am:
fbbb95ffbf
am:
0e84309130
Change-Id: I360e708f8835c8658b82cb0db4ea7b70e594d3d9
Hemal Patel [Tue, 9 Aug 2016 21:26:05 +0000 (21:26 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09 am:
4e79fcdc0a
am:
a32049ce57
Change-Id: I702a08b75978f8269d83d12c2a6e62b05edbb0e0
Hemal Patel [Tue, 9 Aug 2016 21:25:56 +0000 (21:25 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b am:
f8c0a138fb
am:
5f573a891e
Change-Id: I8268f0c6279598df56ab5acfd311f867b8409524
Hemal Patel [Tue, 9 Aug 2016 21:25:48 +0000 (21:25 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761 am:
ee3c5b3cd5
am:
ae5f7e27a0
Change-Id: Ib219ce2fbf9ebf1a97c49696c2f3b2b7df8828f9
Hemal Patel [Tue, 9 Aug 2016 21:25:41 +0000 (21:25 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3 am:
ed51cf2c85
am:
3026c87001
Change-Id: I7eb61c40226aeac16785edb7b56197fb7699ce9c
Hemal Patel [Tue, 9 Aug 2016 21:19:52 +0000 (21:19 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09
am:
cae34dc577
Change-Id: I2ff827a50cb429cdc18b6b2a0fe2275693ebaf20
Hemal Patel [Tue, 9 Aug 2016 21:19:50 +0000 (21:19 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b
am:
3547fd0642
Change-Id: I325c16b92f193be2ff701da64e3896979441d6e7
Hemal Patel [Tue, 9 Aug 2016 21:19:47 +0000 (21:19 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761
am:
57d3e1c9e1
Change-Id: I5913262cbc44ace40d084a608322658f2d3cd010
Hemal Patel [Tue, 9 Aug 2016 21:19:44 +0000 (21:19 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3
am:
fbbb95ffbf
Change-Id: I0297e686573b191cb16049caf762b20a710eb53c
Hemal Patel [Tue, 9 Aug 2016 21:18:58 +0000 (21:18 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09
am:
4e79fcdc0a
Change-Id: Ifc74e8b7c208ef070ce2aaf3d5113245cf1d1273
Hemal Patel [Tue, 9 Aug 2016 21:18:56 +0000 (21:18 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b
am:
f8c0a138fb
Change-Id: Ica3e6f96b4e55991dd946fd3d73ac725c477d03e
Hemal Patel [Tue, 9 Aug 2016 21:18:54 +0000 (21:18 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761
am:
ee3c5b3cd5
Change-Id: I9005ea88dbf6a3c257b9c50bebae5b6f2b0ca77a
Hemal Patel [Tue, 9 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3
am:
ed51cf2c85
Change-Id: Iaf5a7aef73e22b9a536a62966567f93c86c6f2a9
Hemal Patel [Tue, 9 Aug 2016 21:10:42 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: I5145db9e35199969ada9c38a6c5c972725af178b
Hemal Patel [Tue, 9 Aug 2016 21:10:40 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6a17d73c3dab8980c57e9f6c9617bb465c48f1a5
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: Ib00803734137a0a4c3a704e45c45c66e246e586b
Hemal Patel [Tue, 9 Aug 2016 21:10:35 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ief6d2b58e26b4510b00ecb07a5efba180276cd37
Hemal Patel [Tue, 9 Aug 2016 21:10:34 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
Hemal Patel [Tue, 9 Aug 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Erik Wolsheimer [Fri, 5 Aug 2016 16:24:07 +0000 (09:24 -0700)]
Add missing null check to AppErrors#handleAppCrashLocked
BUG:
30692618
Change-Id: Ibe3589e1248520067714d5a20963a17935789066
(cherry picked from commit
dc74142c74bf37e0ddcbe6ec7d76f57191815b44)
Alexandria Cornwall [Tue, 9 Aug 2016 19:36:46 +0000 (12:36 -0700)]
AAPT2: Merge binary XML file attributes
AAPT2 generates extra versions of XML binaries based on the sdkVersion
that attributes were introduced, up to v21. This should only happen for
sdkVersions that are > minSdkVersion, as everything else can be included
in the main configuration (e.g. "layout" instead of "layout-v4").
This change handles the merging of XML binary sdkVersions that were created
implicitly.
Bug:
30705740
Change-Id: I854843dd6dbaca52896cea0c24c70c900cec3e8e
Chad Brubaker [Tue, 9 Aug 2016 20:10:01 +0000 (20:10 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31 am:
6e1f860c6a am:
10943c69a2
am:
46c354f75c
Change-Id: If5da76eebffea8c0be8995422d62694f622a337a
Shawn Willden [Tue, 9 Aug 2016 20:01:12 +0000 (20:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a am:
58635e74ed am:
c9974a889b
am:
7ce1521e13
Change-Id: Id2761501a7a98515ad3de37c8071e0049f83e0dd
Shawn Willden [Tue, 9 Aug 2016 20:01:10 +0000 (20:01 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9 am:
e5d71c4cfa am:
0b90611069
am:
059294e2fd
Change-Id: I0d551078b15189e65b4f021d5b54f0a6e9f3a6ef
Shawn Willden [Tue, 9 Aug 2016 20:01:07 +0000 (20:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a am:
61f9b9227e
am:
81aaf209c2
Change-Id: I4f6883b47dba77060128a713dece08aed1a2f133
Shawn Willden [Tue, 9 Aug 2016 20:01:03 +0000 (20:01 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9 am:
7f35a49d77
am:
1e3d2b847e
Change-Id: I6498f544eb0cbc3fb1166034c588cb2761bab4b6
Chad Brubaker [Tue, 9 Aug 2016 19:59:10 +0000 (19:59 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31 am:
6e1f860c6a
am:
10943c69a2
Change-Id: I51870e48ab7519ef75e1a2643ab5af76918f46db
Andrew Rossignol [Tue, 9 Aug 2016 19:52:46 +0000 (19:52 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev am:
efdd4ac34b
am:
bdd241126d
Change-Id: Ifc1241043829d9780ef16cc72ebbc3b112ff617c
Andrew Rossignol [Tue, 9 Aug 2016 19:52:41 +0000 (19:52 +0000)]
ContextHub: Avoid reference leaks am:
52dda59896
am:
76f65ce9ac
Change-Id: I2035ff4ee44051d9e7b562a2fdad49271c3efb89
Julia Reynolds [Tue, 9 Aug 2016 19:52:34 +0000 (19:52 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am:
6715c6abbd am:
f5c030217f
am:
ba86a74f9a
Change-Id: I47a2bcfeaee47a59c22496985796e1d82210a6c2
Shawn Willden [Tue, 9 Aug 2016 19:52:32 +0000 (19:52 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a am:
58635e74ed
am:
c9974a889b
Change-Id: I0046859ca48a52a5e9cd1c32c44eb4917557edcc
Julia Reynolds [Tue, 9 Aug 2016 19:52:29 +0000 (19:52 +0000)]
Clean up zen rules and permissions immediately on uninstall. am:
6434eb2e04 am:
eaf9974125
am:
7f7b7d5a14
Change-Id: I9def8ae9cf7ba374314a20e74270426b2c2a2377
Shawn Willden [Tue, 9 Aug 2016 19:52:25 +0000 (19:52 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9 am:
e5d71c4cfa
am:
0b90611069
Change-Id: I543ce45e581e3b12b5dde9b055e72b2b7a3ecd7c
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:43:24 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
61f9b9227e
Change-Id: I8e6f93c62f9bba9ca6dbe2f838932e4c42c0c04c
Shawn Willden [Tue, 9 Aug 2016 19:43:17 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
7f35a49d77
Change-Id: I2b86839143ed1419e5f5b025b785d33a600105c4
Shawn Willden [Tue, 9 Aug 2016 19:43:15 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
58635e74ed
Change-Id: Ie3ba00057e4b44c41520af58fd27dfbbb412f3ca
Shawn Willden [Tue, 9 Aug 2016 19:43:10 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
e5d71c4cfa
Change-Id: I5b488b48ca27365bf4066acd1df4bc40a08660f1
Andrew Rossignol [Tue, 9 Aug 2016 19:38:36 +0000 (19:38 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
am:
efdd4ac34b
Change-Id: I05f09b52140d307980c5fabfd0f7a2395d750340
Andrew Rossignol [Tue, 9 Aug 2016 19:38:31 +0000 (19:38 +0000)]
ContextHub: Avoid reference leaks
am:
52dda59896
Change-Id: I78df3e5c2f78684eb1ec5ac4f2781cf88b0fa2f2
Julia Reynolds [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am:
6715c6abbd
am:
f5c030217f
Change-Id: I91d529e072d79aefda24a204ccd653e080a2697d
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
Julia Reynolds [Tue, 9 Aug 2016 19:38:17 +0000 (19:38 +0000)]
Clean up zen rules and permissions immediately on uninstall. am:
6434eb2e04
am:
eaf9974125
Change-Id: I80252835f84de0fc22491c5aa95595819c0d945c
Shawn Willden [Tue, 9 Aug 2016 19:38:05 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I302b1dce1cff57b6f1cd5da3d6619984c80fde92
Shawn Willden [Tue, 9 Aug 2016 19:38:00 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Iadb16bd13d4bb525805dd0266aea046c4c472309
Wale Ogunwale [Tue, 9 Aug 2016 19:35:46 +0000 (19:35 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev am:
6529ab20fb am:
7a5f1d8cd9
am:
4ea242a3c0
Change-Id: I6b8fdf80367150567aad148b726bcb87a2a0e843
Wale Ogunwale [Tue, 9 Aug 2016 19:35:43 +0000 (19:35 +0000)]
Limit number of recents entries for an app to maxRecents allowed. am:
847167fe3d am:
9d0ce42620
am:
cb2338446e
Change-Id: I813e282ab28ab976841cc85c9c60ad4a22359e11
Andrew Rossignol [Tue, 9 Aug 2016 19:17:31 +0000 (19:17 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Julia Reynolds [Tue, 9 Aug 2016 19:10:46 +0000 (19:10 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev
am:
6715c6abbd
Change-Id: I0d41f50144bb308f53c38ee4fa6e6d760adcb79e
Julia Reynolds [Tue, 9 Aug 2016 19:10:43 +0000 (19:10 +0000)]
Clean up zen rules and permissions immediately on uninstall.
am:
6434eb2e04
Change-Id: Id9c534ec4226f341909e151c6703b23b6c7b9af9
Wale Ogunwale [Tue, 9 Aug 2016 19:05:12 +0000 (19:05 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev am:
6529ab20fb
am:
7a5f1d8cd9
Change-Id: Ifde90d35b30bff88cca35136dfff9507d59d1541
Wale Ogunwale [Tue, 9 Aug 2016 19:05:09 +0000 (19:05 +0000)]
Limit number of recents entries for an app to maxRecents allowed. am:
847167fe3d
am:
9d0ce42620
Change-Id: I8f88fff25f11f1605c020089dadad687b756c2ba
Yi Kong [Tue, 9 Aug 2016 19:02:08 +0000 (19:02 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee am:
2ae4d32ca3 am:
e89e884b47
am:
236bd43dfe
Change-Id: Ie4c447de32c1834121188273ad6cf581a2f2a01b
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:59:32 +0000 (18:59 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev
Wale Ogunwale [Tue, 9 Aug 2016 18:54:26 +0000 (18:54 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev
am:
6529ab20fb
Change-Id: Ic38e99f4e4fc04e4d94212ae0c4fd70f5d3352f7
Wale Ogunwale [Tue, 9 Aug 2016 18:54:24 +0000 (18:54 +0000)]
Limit number of recents entries for an app to maxRecents allowed.
am:
847167fe3d
Change-Id: Ib97c8226fc18de59802aacd55b161a3188cab5b8
Andrew Rossignol [Tue, 9 Aug 2016 17:54:38 +0000 (10:54 -0700)]
ContextHub: Avoid reference leaks
The ContextHub HAL was leaking references in passOnOsResponse. An
example of this is when a sensor hub reset occurs. If many of these
resets happen, the local reference pool is exhausted and a crash
in the HAL occurs.
Bug:
30706325
Change-Id: Ica5328137a7033f512d7fb1ccf6fa138eab55091
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
Yi Kong [Tue, 9 Aug 2016 18:26:15 +0000 (18:26 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee am:
2ae4d32ca3
am:
e89e884b47
Change-Id: I66f22f99f5552a46cc269b6ef28f5ac37d805505