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

238567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joachim Sauer
6b6c7fdf65 Merge "Hide general utility methods in ICU4J." into nyc-dev 
am: 3c3a59e

* commit '3c3a59e9493e2cbaad83892da546ee73bffa7060':
  Hide general utility methods in ICU4J.
 2016-03-22 16:38:59 +00:00
Joachim Sauer
3c3a59e949 Merge "Hide general utility methods in ICU4J." into nyc-dev 2016-03-22 16:35:00 +00:00
Aga Wronska
6cc9258371 Merge "Make status bar translucent. Make drawer appera below status bar." into nyc-dev 
am: 1363b67

* commit '1363b677b3ead9e0f04de8be5e0fed0ccf5097c0':
  Make status bar translucent. Make drawer appera below status bar.
 2016-03-22 16:31:11 +00:00
Aga Wronska
1363b677b3 Merge "Make status bar translucent. Make drawer appera below status bar." into nyc-dev 2016-03-22 16:27:49 +00:00
Tony Mantler
b1412c1a41 Merge "Move hint strings to SettingsLib" into nyc-dev 
am: 77ab9bb

* commit '77ab9bb71a6ed5239056b49df6e312075b4ec9a6':
  Move hint strings to SettingsLib
 2016-03-22 16:23:12 +00:00
Ian Pedowitz
c5b34f04d4 Merge "Revert "Sanitize app op service inputs"" into nyc-dev 
am: ef43188

* commit 'ef43188489d287f317af6d48c3145dd2170aaf84':
  Revert "Sanitize app op service inputs"
 2016-03-22 16:17:50 +00:00
Tony Mantler
77ab9bb71a Merge "Move hint strings to SettingsLib" into nyc-dev 2016-03-22 16:16:16 +00:00
Ian Pedowitz
ef43188489 Merge "Revert "Sanitize app op service inputs"" into nyc-dev 2016-03-22 16:14:54 +00:00
Ian Pedowitz
9888e00b7a Revert "Sanitize app op service inputs" 
This reverts commit fcf01503c5f04841bc0b2c51a2f30cffaf60a2f6.

Bug: 26587386
Bug: 27759382
Change-Id: Iedfe3657b51c3965bcbddb6b2dc6dfbc1d7b9c37
 2016-03-22 16:13:48 +00:00
Joachim Sauer
d76fe896d4 Hide general utility methods in ICU4J. 
Bug: 22023363
Change-Id: I1d1624b4846fba7855fa7273fa34646c85369b56
 2016-03-22 16:07:26 +00:00
Paul Duffin
62b7758d44 Merge "ICU4J: Removed a couple of useless or internal methods from API" into nyc-dev 
am: 83ad1c1

* commit '83ad1c16f9e54e35d12b644973da72bae8e2dac4':
  ICU4J: Removed a couple of useless or internal methods from API
 2016-03-22 16:04:18 +00:00
Yang Ni
6a9d594317 Merge "Correctly init code cache path for RS" into nyc-dev 
am: 2cd81f8

* commit '2cd81f8b2c7577b6c60de11d039ebc3a8dab9fe8':
  Correctly init code cache path for RS
 2016-03-22 16:04:16 +00:00
Paul Duffin
e591be8637 Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev 
am: d7ec6e5

* commit 'd7ec6e5a8efc9e1cdd558d5dd2db946139ffee69':
  ICU4J: Update API for using civil version of IslamicCalendar
 2016-03-22 15:59:08 +00:00
Paul Duffin
83ad1c16f9 Merge "ICU4J: Removed a couple of useless or internal methods from API" into nyc-dev 2016-03-22 15:58:21 +00:00
Yang Ni
2cd81f8b2c Merge "Correctly init code cache path for RS" into nyc-dev 2016-03-22 15:57:14 +00:00
Paul Duffin
c108dea0bb ICU4J: Removed a couple of useless or internal methods from API 
Bug: 22023363
Change-Id: Iaa0b4335ad50bbad2ad87ab5b70834a602f50422
 2016-03-22 15:55:01 +00:00
Paul Duffin
d7ec6e5a8e Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev 2016-03-22 15:53:50 +00:00
Tony Mak
438b3f218d Revert getUserInfo change and add isManagedPorfile(int userId) 
am: 8673b28

* commit '8673b2899e775014336efff44ea88dcac2b25bdd':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId) 
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
 2016-03-22 15:26:05 +00:00
Jeff Sharkey
60028a7bda Merge "Make DISK_SCANNED a protected broadcast." into nyc-dev 
am: 030247d

* commit '030247d41b6e9a48248634a27df5264ea41c04ca':
  Make DISK_SCANNED a protected broadcast.
 2016-03-22 15:19:26 +00:00
Jeff Sharkey
d1482005d4 Merge "Only enable asserts on userdebug/eng builds." into nyc-dev 
am: 9d9a55b

* commit '9d9a55be9d04b478266c597c56ffeae5d1de1a62':
  Only enable asserts on userdebug/eng builds.
 2016-03-22 15:19:24 +00:00
Jeff Sharkey
95e092228e Merge "Store trace files in app-specific dirs." into nyc-dev 
am: a17b7d0

* commit 'a17b7d0163fc1309b40ed1c38056b71ef9d147fb':
  Store trace files in app-specific dirs.
 2016-03-22 15:19:23 +00:00
Jeff Sharkey
030247d41b Merge "Make DISK_SCANNED a protected broadcast." into nyc-dev 2016-03-22 15:13:27 +00:00
Jeff Sharkey
9d9a55be9d Merge "Only enable asserts on userdebug/eng builds." into nyc-dev 2016-03-22 15:13:13 +00:00
Jeff Sharkey
a17b7d0163 Merge "Store trace files in app-specific dirs." into nyc-dev 2016-03-22 15:12:44 +00:00
Paul Duffin
74a8e08d59 ICU4J: Update API for using civil version of IslamicCalendar 
Bug: 22023363
Change-Id: I1a3d25be65f9f69767cc32df1b768700e30463cf
 2016-03-22 13:46:38 +00:00
Lorenzo Colitti
2cacf7c1ec Merge "Delete dead code." into nyc-dev 
am: 3527a2f

* commit '3527a2f1a2c48107d5065c2c3186e8f4b3ca58d8':
  Delete dead code.
 2016-03-22 11:42:53 +00:00
Lorenzo Colitti
3527a2f1a2 Merge "Delete dead code." into nyc-dev 2016-03-22 11:40:29 +00:00
Benjamin Franz
37c5dff49d Merge "Clean up some javadoc issues" into nyc-dev 
am: 517a958

* commit '517a9583a869ed1913efeb003592db184d1a09e0':
  Clean up some javadoc issues
 2016-03-22 11:37:26 +00:00
Benjamin Franz
517a9583a8 Merge "Clean up some javadoc issues" into nyc-dev 2016-03-22 11:30:47 +00:00
Benjamin Franz
ea95624290 Clean up some javadoc issues 
Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f
 2016-03-22 11:26:48 +00:00
Daichi Hirono
c4949ad167 Merge "Revert "Open drawer when showing copy/move destination screen"" into nyc-dev 
am: 5c3a152

* commit '5c3a1525b3345752d37e1604d85d545f14abda0a':
  Revert "Open drawer when showing copy/move destination screen"
 2016-03-22 10:52:22 +00:00
Daichi Hirono
5c3a1525b3 Merge "Revert "Open drawer when showing copy/move destination screen"" into nyc-dev 2016-03-22 10:46:45 +00:00
Daichi Hirono
82ae18c877 Revert "Open drawer when showing copy/move destination screen" 
This reverts commit 4d5f9f6a7f3b9aa8f7fd1a733ba739e5bfe3ed66.
The CL breaks android.appsecurity.cts.DocumentsTest.

BUG: 27746116, 27479369
Change-Id: Ib9426c54e8c9841f3def55a88e07bf4a2cd7dcac
 2016-03-22 19:43:41 +09:00
Tomasz Mikolajewski
1a125db8b8 Merge "Notify via TalkBack about selected items." into nyc-dev 
am: ace5a78

* commit 'ace5a7819486309a639fb4f4505839f46db55e3c':
  Notify via TalkBack about selected items.
 2016-03-22 09:47:11 +00:00
Tomasz Mikolajewski
ace5a78194 Merge "Notify via TalkBack about selected items." into nyc-dev 2016-03-22 09:40:51 +00:00
Daichi Hirono
961672bd05 Merge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev 
am: f416030

* commit 'f4160302771dc688f56fac57bdab234fcbc71b04':
  Fix null pointer exception when MTP/PTP device is detached.
 2016-03-22 09:01:41 +00:00
Daichi Hirono
f416030277 Merge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev 2016-03-22 08:56:00 +00:00
Tomasz Mikolajewski
52137acd0c Notify via TalkBack about selected items. 
Bug: 27723098
Change-Id: I6927b004b3e5a592325646ae3a4663bb298a65c8
 2016-03-22 16:43:59 +09:00
Erik Kline
e96834c583 Merge "Support registering a request for the default network" into nyc-dev 
am: d36ba73

* commit 'd36ba73ffc88cf20f5cd70e21271ce0ee35c838f':
  Support registering a request for the default network
 2016-03-22 07:30:50 +00:00
Erik Kline
d36ba73ffc Merge "Support registering a request for the default network" into nyc-dev 2016-03-22 07:28:08 +00:00
Lorenzo Colitti
bf4a6574b1 Delete dead code. 
Change-Id: If8052efaa00f15e5c7eb038435be33206d54276a
 2016-03-22 16:27:41 +09:00
Jaewan Kim
0b6d2b639a Merge "PIP: Increase the PIP menu\'s char limits for translation" into nyc-dev 
am: c2d93dd

* commit 'c2d93dd3215fd6cacc3d07d5197eb7eb586456fa':
  PIP: Increase the PIP menu's char limits for translation
 2016-03-22 07:25:36 +00:00
Jaewan Kim
c2d93dd321 Merge "PIP: Increase the PIP menu's char limits for translation" into nyc-dev 2016-03-22 07:19:36 +00:00
Erik Kline
a2d29407d0 Support registering a request for the default network 
Change-Id: I079f5be97b585cf5692dd4c7a144b993d168a9a5
 2016-03-22 15:44:16 +09:00
Jaesung Chung
074dfab69c Merge "ExifInterface: fix logs" into nyc-dev 
am: 285bbbb

* commit '285bbbbda45f51f53d18144b7e65edb88c888f1c':
  ExifInterface: fix logs
 2016-03-22 05:44:30 +00:00
Jaesung Chung
8dec91bf9d Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 
am: f2a1076

* commit 'f2a1076cd3d8fa1e5e6b9ced4380860e720675f7':
  ExifInterface: fix writing STRING and SRATIONAL formats
 2016-03-22 05:44:28 +00:00
Lorenzo Colitti
7ceb8f5382 Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev 
am: e6109dd

* commit 'e6109ddd3ee52f22c95e5284c325602fbdd5159f':
  Remove framework code that calls SIOCKILLADDR
 2016-03-22 05:44:26 +00:00
Jaesung Chung
285bbbbda4 Merge "ExifInterface: fix logs" into nyc-dev 2016-03-22 05:39:27 +00:00
Jaesung Chung
f2a1076cd3 Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 2016-03-22 05:38:27 +00:00