Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,768 Commits 3 Branches 0 Tags
faa5ccabbcf77c0a1e34c696b40d86fb1163fe28
Commit Graph

47965 Commits

Author SHA1 Message Date
Ruben Brunk
faa5ccabbc am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
automerge: 2847eb7

* commit '2847eb7324ea94fb60f63c0de84c16316cb2851f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 18:23:43 +00:00
Ruben Brunk
2847eb7324 am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit 'a345b3671a8e2d1a91ccb594f219303d3e1f135f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:55:19 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Zoltan Szatmary-Ban
ce2552d980 am 99d983b0: am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev automerge: b3e8ff0 
* commit '99d983b0860272c2edf4e2585995ec064e759b6b':
  Adding method to query backup manager service activity status
 2014-11-21 15:31:44 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Filip Gruszczynski
b898936a00 am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5a429758e9df7b49c616105b510eff42bf7bde69':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 12:19:45 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Alan Viverette
d679cf04de am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9 
* commit 'ac280c48d05c4d23f0d2b0e2622376b374198fef':
  Update scrollbars to match Material spec
 2014-11-21 12:18:26 +00:00
Alan Viverette
ced4c827af am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f 
* commit 'a35d07a4f0bb743e03fc5422b45851e639c2f0a8':
  Update overflow menu alignment to match spec
 2014-11-21 12:18:21 +00:00
Dianne Hackborn
caff64dfe7 am 676b1d88: am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b 
* commit '676b1d886c95a2481dc377a9c2a6e045f08326e0':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 12:18:15 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
John Reck
565e9be4ac am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev automerge: d3e5777 
* commit '51efa8ef3f3faeec5772fccf46f629f2e44853c2':
  If the surface is lost, release it
 2014-11-21 12:17:33 +00:00
Narayan Kamath
57616d3e55 resolved conflicts for merge of 18e3727f to master 
Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066
 2014-11-21 11:57:07 +00:00
Filip Gruszczynski
5a429758e9 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:26:31 +00:00
Filip Gruszczynski
5ea0411f39 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:21:19 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Jaewan Kim
e95b9dd57f am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f 
* commit 'b5ba786ccb9265ed076cda088ddbfded3ecc7f85':
  Add an API to check availability of Ethernet interface.
 2014-11-21 03:11:35 +00:00
Christopher Tate
5b0528b5e1 am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
  Recents backup helper
 2014-11-21 03:09:06 +00:00
Alan Viverette
ac280c48d0 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
automerge: fa4eba9

* commit 'fa4eba96374b971c13ee6427c74a78503c958757':
  Update scrollbars to match Material spec
 2014-11-21 03:03:46 +00:00
Alan Viverette
a35d07a4f0 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
automerge: 69b802f

* commit '69b802fdb6a5920bb0bd0270298450ede52dcaf1':
  Update overflow menu alignment to match spec
 2014-11-21 03:02:39 +00:00
Dianne Hackborn
676b1d886c am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 
automerge: c43613b

* commit 'c43613becf0146a0d54ff15f5ca024d759c43290':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 03:01:09 +00:00
Eino-Ville Talvala
4fc0ec51cf am 1432a40f: am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev automerge: b22de13 
* commit '1432a40ff3702a09c4291965f078708e23de08d3':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-21 02:58:27 +00:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Erik Kline
30246e3d37 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 02:57:09 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
John Reck
51efa8ef3f am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev 
automerge: d3e5777

* commit 'd3e5777e790cc98bb65ee047c4444ca233883d3f':
  If the surface is lost, release it
 2014-11-21 02:56:03 +00:00
John Reck
18e3727f68 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
automerge: 9b5d427

* commit '9b5d427fe0e557d572657252e7b5a3fd99a74550':
  Rename callDrawGLFunction
 2014-11-21 02:55:00 +00:00
Jaewan Kim
b5ba786ccb am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 
automerge: 52dcc7f

* commit '52dcc7fb0a17a77c41eddd1517821134946120b1':
  Add an API to check availability of Ethernet interface.
 2014-11-21 02:52:28 +00:00
Eino-Ville Talvala
1432a40ff3 am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 
automerge: b22de13

* commit 'b22de13fdb195716006b8e9b03f52d3ab60aecd5':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-21 02:51:02 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Adam Lesinski
68976003f0 am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6 
* commit '36671b925c6b5b9e547561c5bacf3419cf71897f':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:42:23 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Adam Lesinski
36671b925c am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:36:57 +00:00
Christopher Tate
b2b8dcba2c am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
  Recents backup helper
 2014-11-21 02:30:11 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Alan Viverette
4d6b1549a7 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
automerge: aed1268

* commit 'aed12685b0e6e8146f3f22f5c938a4e3d6ca9b38':
  Move default token handling into WindowManagerImpl
 2014-11-21 02:23:47 +00:00
Alan Viverette
fa4eba9637 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
* commit '8ae8500365e71c59cbe96f600371391ac8d245b8':
  Update scrollbars to match Material spec
 2014-11-21 02:16:17 +00:00
Alan Viverette
8ae8500365 Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 2014-11-21 02:12:10 +00:00
Alan Viverette
69b802fdb6 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
* commit '69fe1e8e5fef5ceac9aa476995623fe80424019d':
  Update overflow menu alignment to match spec
 2014-11-21 01:55:19 +00:00
Dianne Hackborn
f8c3691425 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.
 2014-11-21 01:52:23 +00:00
Martijn Coenen
51041cb7da am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
automerge: 0d4a4e6

* commit '0d4a4e6e59267ed58d9fe44303e400877aa1caab':
  Verify NFC permission immediately on API calls.
 2014-11-21 01:51:04 +00:00
Alan Viverette
69fe1e8e5f Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 2014-11-21 01:50:38 +00:00
Alan Viverette
aed12685b0 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
  Move default token handling into WindowManagerImpl
 2014-11-21 01:38:26 +00:00