Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,157 Commits 3 Branches 0 Tags
bb20c3dd95938ccbbcb085ade542d4ceae376311
Commit Graph

254157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
bb20c3dd95 Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc73347152 
am: 36eb3771c1

* commit '36eb3771c14685ce8e6e390ea73f08cf55275a6f':
  Skip 'network may be monitored' if dying or locked

Change-Id: Ie2f98d0592537439a2a16e0647bff34a3880998f
 2016-05-17 09:28:13 +00:00
Android Build Merger (Role)
7c085e431e Merge "Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 am: ec200415f5" into nyc-mr1-dev-plus-aosp 2016-05-17 09:25:44 +00:00
Clara Bayarri
21a14dff74 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 
am: ec200415f5

* commit 'ec200415f587f6739990056c8e2eb2c1e42eded9':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Idb6c80f2bd6d20d7960a0db7d2f1fb790defcc98
 2016-05-17 09:25:20 +00:00
Robin Lee
36eb3771c1 Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev 
am: bc73347152

* commit 'bc73347152a3562a7f957a07433d64912f4acd83':
  Skip 'network may be monitored' if dying or locked

Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa
 2016-05-17 09:24:59 +00:00
Clara Bayarri
4cfd27f9aa Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 
am: 60d0910dc8

* commit '60d0910dc8754a9e661ab9b68cdac0b316c35753':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Ia917dd039f7ecde4bc3d093fe7f4900c66dfc590
 2016-05-17 09:24:52 +00:00
Clara Bayarri
60d0910dc8 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
 2016-05-17 09:21:15 +00:00
Clara Bayarri
ec200415f5 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
 2016-05-17 09:20:43 +00:00
Robin Lee
bc73347152 Merge "Skip 'network may be monitored' if dying or locked" into nyc-dev 2016-05-17 09:17:21 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Android Build Merger (Role)
f94e2e4764 Merge "Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978 am: 1f7f9bc780" into nyc-mr1-dev-plus-aosp 2016-05-17 08:46:18 +00:00
Narayan Kamath
03c1e809ae Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978 
am: 4803983717

* commit '4803983717442b1099b9679b3b0d822cb8511509':
  PackageManager: Clear foreign-dex markers when the app is uninstalled.

Change-Id: If68e3bc94332d0873602d51c4328d8dfc106821d
 2016-05-17 08:45:34 +00:00
Narayan Kamath
45079ade1c Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978 
am: 1f7f9bc780

* commit '1f7f9bc78023b59ca31553b90566cd79aea7a9c1':
  PackageManager: Clear foreign-dex markers when the app is uninstalled.

Change-Id: I0d6307a9923a37adfa0ae01830382d026a1a99f4
 2016-05-17 08:45:19 +00:00
Narayan Kamath
1f7f9bc780 Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev 
am: a8b4f75978

* commit 'a8b4f7597842b17b44e1ea859f218d610789e277':
  PackageManager: Clear foreign-dex markers when the app is uninstalled.

Change-Id: I0c04c86d35999414b596baa92b98425aca2da00e
 2016-05-17 08:40:39 +00:00
Narayan Kamath
4803983717 Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev 
am: a8b4f75978

* commit 'a8b4f7597842b17b44e1ea859f218d610789e277':
  PackageManager: Clear foreign-dex markers when the app is uninstalled.

Change-Id: I840fb5710bddcbdc69f7899b7432afe1f660de4e
 2016-05-17 08:40:22 +00:00
Narayan Kamath
a8b4f75978 Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev 2016-05-17 08:31:44 +00:00
Android Build Merger (Role)
0c336f8cca Merge "Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636 am: c19cf44966 am: c682dfbb70" into nyc-mr1-dev-plus-aosp 2016-05-17 03:39:49 +00:00
David Friedman
88ab19a175 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636 am: c19cf44966 
am: c682dfbb70

* commit 'c682dfbb706cd180edd92bb66135a48d48d77446':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: Ifb82213a2a580373d4c8b762568582f483e22d21
 2016-05-17 03:39:29 +00:00
David Friedman
803967c36f Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636 am: c19cf44966 
am: a41977d0d1

* commit 'a41977d0d1db0a8450bd13370e6ca022795d8257':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I6570064c80d9674c0bc62869865b33c03d282a20
 2016-05-17 03:39:15 +00:00
David Friedman
a41977d0d1 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636 
am: c19cf44966

* commit 'c19cf449664e985f0bb07833daadf533ec0dfa1c':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I378bed62f060bbbf99d103f206088dcd048525bd
 2016-05-17 03:34:15 +00:00
David Friedman
c682dfbb70 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636 
am: c19cf44966

* commit 'c19cf449664e985f0bb07833daadf533ec0dfa1c':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I63ce9bb629c733bc494e27868727a79f4471af9c
 2016-05-17 03:33:55 +00:00
David Friedman
c19cf44966 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 
am: 86b5f72636

* commit '86b5f726368c873c8503ed7a8042cfa954f5e1a0':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I83923831a50a94f46d05e18cfc4d69c68b2e58ed
 2016-05-17 03:29:11 +00:00
David Friedman
86b5f72636 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs 
am: bf56921d35

* commit 'bf56921d3527ad0652f4224b422dd611ec1a6fee':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I8150c709818232cf24e4d967de45aeb1bd4c2956
 2016-05-17 03:23:46 +00:00
David Friedman
bf56921d35 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs 2016-05-17 03:17:41 +00:00
David Friedman
182e8b53ea Docs: CL for continuing work on tactically merged N-DP3 docs. 
This CL continues the work from ag/1036623 and ag/1036124.

Change-Id: Ic1e026ed9f53a389a0435c2b8e21edfe9ef635c4
 2016-05-16 19:39:08 -07:00
Android Build Merger (Role)
373cbac7ad Merge "Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: d4056a279d" into nyc-mr1-dev-plus-aosp 2016-05-17 01:11:01 +00:00
Chris Tate
d0e6a0e3dd Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 
am: d4056a279d

* commit 'd4056a279d34900b396229c79d591d1ed8bf1ea1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Iaf3ffcfa8ece43eca0118bb3c03fc380417af001
 2016-05-17 01:10:39 +00:00
Chris Tate
c4999be6e3 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 
am: b7ae368079

* commit 'b7ae3680798aa5dce807015a763a0d017ce7e0c1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Idcc14b5f890497a6bf59755d91f66c27f5db3451
 2016-05-17 01:09:35 +00:00
Android Build Merger (Role)
96a71d86f0 Merge "Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 273d6e8f56" into nyc-mr1-dev-plus-aosp 2016-05-17 01:05:55 +00:00
Wale Ogunwale
d79cb3bd10 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 273d6e8f56

* commit '273d6e8f565fbb2b9bac9c81764242a39e431cfd':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I32680230f109355f13873775c1112359e010d45a
 2016-05-17 01:05:30 +00:00
Christopher Tate
b7ae368079 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I5987e96ea1d2668037a7f924ad3ee6b5fa96bda8
 2016-05-17 01:05:23 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
 2016-05-17 01:05:00 +00:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
 2016-05-17 01:03:59 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
 2016-05-17 00:59:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
 2016-05-17 00:57:25 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Android Build Merger (Role)
77ccfc8fe9 Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 52ccdf05d7" into nyc-mr1-dev-plus-aosp 2016-05-17 00:48:20 +00:00
Amith Yamasani
8c5bba9107 Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 52ccdf05d7

* commit '52ccdf05d702d4e34a08b67d3edc0c17b5178117':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I28c3e69c102eb3669cf31774e73a90841dc449d4
 2016-05-17 00:47:49 +00:00
Wale Ogunwale
b431f58574 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev am: fc932b9d69 
am: 245d5580aa

* commit '245d5580aa014d9ae93b26c295f8c6b751f501a8':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5848341577b9695d884f49db4b37b5a18bcbe7be
 2016-05-17 00:47:40 +00:00
Android Build Merger (Role)
c4ac937dab Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 9db4384118" into nyc-mr1-dev-plus-aosp 2016-05-17 00:44:51 +00:00
Amith Yamasani
77069b959b Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 0250ae2c1b

* commit '0250ae2c1b1b3b75a9b1f3c995be031efef50bcf':
  Allow Shell to change component enabled state

Change-Id: I2a29c8e15ba81a9aa5c3950c8aeccd3d4ff662cc
 2016-05-17 00:42:43 +00:00
Amith Yamasani
c562b7886e Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 9db4384118

* commit '9db4384118911abd55ee528e570707be2af3f85b':
  Allow Shell to change component enabled state

Change-Id: I9a309ea4fb46925de793b339896629ca43cb053f
 2016-05-17 00:42:43 +00:00
Wale Ogunwale
245d5580aa Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I2211b2a8eb03a692bdbc6124f0103340c39c4adc
 2016-05-17 00:38:50 +00:00
Wale Ogunwale
52ccdf05d7 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5f121bb48513d054f53d17bd7a1030adb59d2a2e
 2016-05-17 00:37:47 +00:00
Amith Yamasani
9db4384118 Merge "Allow Shell to change component enabled state" into nyc-dev 
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I964e0aebb669adf368524454e2ca681784e8e67b
 2016-05-17 00:34:30 +00:00
Amith Yamasani
0250ae2c1b Merge "Allow Shell to change component enabled state" into nyc-dev 
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I8b472bf3149b1e721ea90a8a6fed12549e3f1510
 2016-05-17 00:34:16 +00:00
TreeHugger Robot
fc932b9d69 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 2016-05-17 00:29:04 +00:00
Amith Yamasani
19b34eccfe Merge "Allow Shell to change component enabled state" into nyc-dev 2016-05-17 00:27:55 +00:00
Android Build Merger (Role)
cde1df9222 Merge "Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: fa3e66e0ae" into nyc-mr1-dev-plus-aosp 2016-05-17 00:13:23 +00:00
Chris Craik
60309d64e2 Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 
am: fa3e66e0ae

* commit 'fa3e66e0aef5b4868a554fcebcaba502426cbe89':
  Fix hw layer overdraw/update visualization

Change-Id: Ib2f1a4d6f8584ce9c25da0c810622b5e11c1f921
 2016-05-17 00:13:01 +00:00